diff options
-rw-r--r-- | src/app.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -699,9 +699,8 @@ static void init_App_(iApp *d, int argc, char **argv) { | |||
699 | #endif | 699 | #endif |
700 | d->isDarkSystemTheme = iTrue; /* will be updated by system later on, if supported */ | 700 | d->isDarkSystemTheme = iTrue; /* will be updated by system later on, if supported */ |
701 | init_CommandLine(&d->args, argc, argv); | 701 | init_CommandLine(&d->args, argc, argv); |
702 | /* Where was the app started from? We ask SDL first because the command line alone is | 702 | /* Where was the app started from? We ask SDL first because the command line alone |
703 | not a reliable source of this information, particularly when it comes to different | 703 | cannot be relied on (behavior differs depending on OS). */ { |
704 | operating systems. */ { | ||
705 | char *exec = SDL_GetBasePath(); | 704 | char *exec = SDL_GetBasePath(); |
706 | if (exec) { | 705 | if (exec) { |
707 | d->execPath = newCStr_String(concatPath_CStr( | 706 | d->execPath = newCStr_String(concatPath_CStr( |
@@ -713,9 +712,10 @@ static void init_App_(iApp *d, int argc, char **argv) { | |||
713 | SDL_free(exec); | 712 | SDL_free(exec); |
714 | } | 713 | } |
715 | #if defined (iHaveLoadEmbed) | 714 | #if defined (iHaveLoadEmbed) |
716 | /* Load the resources from a file. */ { | 715 | /* Load the resources from a file. Check the executable directory first, then a |
717 | if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) { | 716 | system-wide location, and as a final fallback, the current working directory. */ { |
718 | if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) { | 717 | if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) { |
718 | if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) { | ||
719 | if (!load_Embed("resources.lgr")) { | 719 | if (!load_Embed("resources.lgr")) { |
720 | fprintf(stderr, "failed to load resources: %s\n", strerror(errno)); | 720 | fprintf(stderr, "failed to load resources: %s\n", strerror(errno)); |
721 | exit(-1); | 721 | exit(-1); |