miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows compilation fixes

Browse Source
This commit is contained in:
Sergii Pylypenko
2017-02-02 19:58:17 +02:00
parent 9b363c59f0
commit cd865fc77a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_gui.cpp
View File

@@ -570,7 +570,9 @@ void SetupColoursAndInitialWindow()
static int counter = 5; // This part of code is called several times during startup, which closes all windows, so we need to put random hacks here static int counter = 5; // This part of code is called several times during startup, which closes all windows, so we need to put random hacks here
counter--; counter--;
ShowGameOptions(); ShowGameOptions();
#ifndef WIN32
if (counter == 0) unsetenv("SDL_RESTART_PARAMS"); if (counter == 0) unsetenv("SDL_RESTART_PARAMS");
#endif
} }
break; break;

2
src/openttd.cpp
View File

@@ -737,12 +737,14 @@ int openttd_main(int argc, char *argv[])
_cursor.in_window = true; _cursor.in_window = true;
{ {
#ifndef WIN32
// Configure local font path on Android // Configure local font path on Android
//char curdir[PATH_MAX]; //char curdir[PATH_MAX];
//getcwd(curdir, sizeof(curdir)); //getcwd(curdir, sizeof(curdir));
//setenv("FONTCONFIG_FONTS", (std::string(curdir) + "/fonts").c_str(), 1); //setenv("FONTCONFIG_FONTS", (std::string(curdir) + "/fonts").c_str(), 1);
setenv("FONTCONFIG_FONTS", "fonts", 1); setenv("FONTCONFIG_FONTS", "fonts", 1);
DEBUG(misc, 1, "Set FONTCONFIG_FONTS to %s", getenv("FONTCONFIG_FONTS")); DEBUG(misc, 1, "Set FONTCONFIG_FONTS to %s", getenv("FONTCONFIG_FONTS"));
#endif
} }
/* enumerate language files */ /* enumerate language files */
InitializeLanguagePacks(); InitializeLanguagePacks();