Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 188561 | Differences between
and this patch

Collapse All | Expand All

(-)opengl/zerogs.cpp.orig (-15 / +7 lines)
Lines 112-119 Link Here
112
char* EFFECT_DIR = "C:\\programming\\ps2dev\\zerogs\\opengl\\";
112
char* EFFECT_DIR = "C:\\programming\\ps2dev\\zerogs\\opengl\\";
113
char* EFFECT_NAME = "C:\\programming\\ps2dev\\zerogs\\opengl\\ps2hw.fx";
113
char* EFFECT_NAME = "C:\\programming\\ps2dev\\zerogs\\opengl\\ps2hw.fx";
114
#else
114
#else
115
char EFFECT_DIR[255] = "~/pcsx2/plugins/gs/zerogs/opengl/";
115
char EFFECT_DIR[255] = "~/.pcsx2/";
116
char EFFECT_NAME[255] = "~/pcsx2/plugins/gs/zerogs/opengl/ps2hw.fx";
116
char EFFECT_NAME[255] = "ps2hw.fx";
117
#endif
117
#endif
118
118
119
#endif
119
#endif
Lines 1335-1359 Link Here
1335
    char curwd[255];
1335
    char curwd[255];
1336
    getcwd(curwd, ARRAY_SIZE(curwd));
1336
    getcwd(curwd, ARRAY_SIZE(curwd));
1337
1337
1338
    strcpy(tempstr, "../plugins/gs/zerogs/opengl/");
1338
    strcpy(tempstr, curwd);
1339
    sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
1339
    sprintf(EFFECT_NAME, "%s/ps2hw.fx", tempstr);
1340
    FILE* f = fopen(EFFECT_NAME, "r");
1340
    FILE* f = fopen(EFFECT_NAME, "r");
1341
    if( f == NULL ) {
1341
    if( f == NULL ) {
1342
1342
        return false;
1343
        strcpy(tempstr, "../../plugins/gs/zerogs/opengl/");
1344
        sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);
1345
        f = fopen(EFFECT_NAME, "r");
1346
1347
        if( f == NULL ) {
1348
            ERROR_LOG("Failed to find %s, try compiling a non-devbuild\n", EFFECT_NAME);
1349
            return false;
1350
        }
1351
    }
1343
    }
1352
1344
1353
    fclose(f);
1345
    fclose(f);
1354
1346
1355
    sprintf(EFFECT_DIR, "%s/%s", curwd, tempstr);
1347
    sprintf(EFFECT_DIR, "%s", tempstr);
1356
    sprintf(EFFECT_NAME, "%sps2hw.fx", EFFECT_DIR);
1348
    sprintf(EFFECT_NAME, "%s/ps2hw.fx", EFFECT_DIR);
1357
#endif
1349
#endif
1358
1350
1359
#endif // RELEASE_TO_PUBLIC
1351
#endif // RELEASE_TO_PUBLIC

Return to bug 188561