mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 11:42:31 +01:00
Code Issues Projects Releases Wiki Activity

- fix broken win32 compile (but no freetype2 support yet)

Browse Source
This commit is contained in:
Mark Vejvoda 2011-06-06 22:37:27 +00:00
parent c808a5661a
commit df178e5eb4
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/main/main.cpp
View File

@ -57,6 +57,8 @@
#include <dbghelp.h>
#endif
#include <stdlib.h>
#include "leak_dumper.h"
#ifndef WIN32
@ -2560,7 +2562,12 @@ int glestMain(int argc, char** argv) {
if( lang.hasString("MEGAGLEST_FONT")) {
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/ttf-japanese-gothic.ttf",0); // Japanese
#if defined(WIN32)
string newEnvValue = "MEGAGLEST_FONT=" + lang.get("MEGAGLEST_FONT");
_putenv(newEnvValue.c_str());
#else
setenv("MEGAGLEST_FONT",lang.get("MEGAGLEST_FONT").c_str(),0);
#endif
}
#if defined(WIN32)
@ -2584,7 +2591,8 @@ int glestMain(int argc, char** argv) {
}
if( lang.hasString("MEGAGLEST_FONT_WINDOWS")) {
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/ttf-japanese-gothic.ttf",0); // Japanese
setenv("MEGAGLEST_FONT",lang.get("MEGAGLEST_FONT_WINDOWS").c_str(),0);
string newEnvValue = "MEGAGLEST_FONT=" + lang.get("MEGAGLEST_FONT_WINDOWS");
_putenv(newEnvValue.c_str());
}
// end win32

2
source/shared_lib/include/platform/sdl/types.h
View File

@ -34,7 +34,9 @@ typedef Uint32 uint32;
typedef Sint64 int64;
typedef Uint64 uint64;
#ifndef WIN32
typedef uint8 byte;
#endif
}}//end namespace

2
source/shared_lib/include/platform/win32/types.h
View File

@ -33,6 +33,8 @@ typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
typedef uint8 byte;
}}//end namespace
#endif

2
source/shared_lib/sources/graphics/font.cpp
View File

@ -20,13 +20,13 @@
#include <algorithm>
//#include "string_utils.h"
using namespace Shared::Util;
using namespace Shared::Graphics::Gl;
#endif
#include "leak_dumper.h"
using namespace std;
using namespace Shared::Util;
using namespace Shared::Graphics::Gl;
namespace Shared{ namespace Graphics{