- fixed win32 build in vc++ 2008
This commit is contained in:
parent
0e8a65b883
commit
1d10d93f64
|
@ -40,7 +40,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include";..\..\source\glest_game\global;..\..\source\glest_game\facilities;..\..\source\glest_game\game"
|
||||
PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__;CURL_STATICLIB"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
@ -117,7 +117,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/arch:SSE2"
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;"..\..\source\win32_deps\wxWidgets-2.8.10\include";..\..\source\shared_lib\include\xml;"../../source/win32_deps/xerces-c-3.0.1/src";..\..\source\shared_lib\include\platform\sdl;../../source/shared_lib/include/platform/common;"../../source/win32_deps/SDL-1.2.x/include";"../../source/win32_deps/curl-7.21.3/include";..\..\source\glest_game\global;..\..\source\glest_game\facilities;..\..\source\glest_game\game"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
|
@ -284,6 +284,10 @@
|
|||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\source\glest_game\global\config.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\source\configurator\configuration.cpp"
|
||||
>
|
||||
|
|
|
@ -86,6 +86,7 @@ namespace Glest{ namespace Game{
|
|||
|
||||
bool disableBacktrace = false;
|
||||
bool gameInitialized = false;
|
||||
//static string application_binary="";
|
||||
static string application_binary="";
|
||||
static string mg_app_name = "";
|
||||
static string mailStringSupport = "";
|
||||
|
@ -1975,6 +1976,7 @@ int glestMain(int argc, char** argv) {
|
|||
AllocRegistry memoryLeaks = AllocRegistry::getInstance();
|
||||
#endif
|
||||
|
||||
application_binary= executable_path(argv[0],true);
|
||||
mg_app_name = GameConstants::application_name;
|
||||
mailStringSupport = mailString;
|
||||
SystemFlags::ENABLE_THREADED_LOGGING = false;
|
||||
|
@ -2721,10 +2723,10 @@ int glestMainWrapper(int argc, char** argv) {
|
|||
//#endif
|
||||
#endif
|
||||
|
||||
application_binary= executable_path(argv[0],true);
|
||||
#ifdef WIN32_STACK_TRACE
|
||||
__try {
|
||||
#endif
|
||||
|
||||
//application_binary= executable_path(argv[0],true);
|
||||
//printf("\n\nargv0 [%s] application_binary [%s]\n\n",argv[0],application_binary.c_str());
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user