mirror of
https://github.com/glest/glest-source.git
synced 2025-08-11 02:43:57 +02:00
- fix broken win32 compile (but no freetype2 support yet)
This commit is contained in:
@@ -57,6 +57,8 @@
|
|||||||
#include <dbghelp.h>
|
#include <dbghelp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "leak_dumper.h"
|
#include "leak_dumper.h"
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
@@ -2560,7 +2562,12 @@ int glestMain(int argc, char** argv) {
|
|||||||
|
|
||||||
if( lang.hasString("MEGAGLEST_FONT")) {
|
if( lang.hasString("MEGAGLEST_FONT")) {
|
||||||
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/ttf-japanese-gothic.ttf",0); // Japanese
|
//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);
|
setenv("MEGAGLEST_FONT",lang.get("MEGAGLEST_FONT").c_str(),0);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(WIN32)
|
#if defined(WIN32)
|
||||||
@@ -2584,7 +2591,8 @@ int glestMain(int argc, char** argv) {
|
|||||||
}
|
}
|
||||||
if( lang.hasString("MEGAGLEST_FONT_WINDOWS")) {
|
if( lang.hasString("MEGAGLEST_FONT_WINDOWS")) {
|
||||||
//setenv("MEGAGLEST_FONT","/usr/share/fonts/truetype/ttf-japanese-gothic.ttf",0); // Japanese
|
//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
|
// end win32
|
||||||
|
@@ -34,7 +34,9 @@ typedef Uint32 uint32;
|
|||||||
typedef Sint64 int64;
|
typedef Sint64 int64;
|
||||||
typedef Uint64 uint64;
|
typedef Uint64 uint64;
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
typedef uint8 byte;
|
typedef uint8 byte;
|
||||||
|
#endif
|
||||||
|
|
||||||
}}//end namespace
|
}}//end namespace
|
||||||
|
|
||||||
|
@@ -33,6 +33,8 @@ typedef unsigned int uint32;
|
|||||||
typedef long long int64;
|
typedef long long int64;
|
||||||
typedef unsigned long long uint64;
|
typedef unsigned long long uint64;
|
||||||
|
|
||||||
|
typedef uint8 byte;
|
||||||
|
|
||||||
}}//end namespace
|
}}//end namespace
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -20,13 +20,13 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
//#include "string_utils.h"
|
//#include "string_utils.h"
|
||||||
using namespace Shared::Util;
|
using namespace Shared::Util;
|
||||||
|
using namespace Shared::Graphics::Gl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "leak_dumper.h"
|
#include "leak_dumper.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace Shared::Util;
|
using namespace Shared::Util;
|
||||||
using namespace Shared::Graphics::Gl;
|
|
||||||
|
|
||||||
namespace Shared{ namespace Graphics{
|
namespace Shared{ namespace Graphics{
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user