diff --git a/mk/windows/vs2015-32/g3d_viewer.vcxproj b/mk/windows/vs2015-32/g3d_viewer.vcxproj index 7ed1e1626..f80d88da4 100644 --- a/mk/windows/vs2015-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-32/g3d_viewer.vcxproj @@ -160,7 +160,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2015-32/libzetaglest.vcxproj b/mk/windows/vs2015-32/libzetaglest.vcxproj index 93203cf54..ba0bbfd52 100644 --- a/mk/windows/vs2015-32/libzetaglest.vcxproj +++ b/mk/windows/vs2015-32/libzetaglest.vcxproj @@ -592,6 +592,7 @@ + diff --git a/mk/windows/vs2015-32/map_editor.vcxproj b/mk/windows/vs2015-32/map_editor.vcxproj index 55491a26c..48b90e7b4 100644 --- a/mk/windows/vs2015-32/map_editor.vcxproj +++ b/mk/windows/vs2015-32/map_editor.vcxproj @@ -157,7 +157,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2015-32/zetaglest.vcxproj b/mk/windows/vs2015-32/zetaglest.vcxproj index d444c15d8..a2182dc6b 100644 --- a/mk/windows/vs2015-32/zetaglest.vcxproj +++ b/mk/windows/vs2015-32/zetaglest.vcxproj @@ -470,7 +470,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true diff --git a/mk/windows/vs2015-64/g3d_viewer.vcxproj b/mk/windows/vs2015-64/g3d_viewer.vcxproj index d78dce566..ed4f73dcf 100644 --- a/mk/windows/vs2015-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-64/g3d_viewer.vcxproj @@ -238,7 +238,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2015-64/libzetaglest.vcxproj b/mk/windows/vs2015-64/libzetaglest.vcxproj index d5c30282c..48f0e1a8d 100644 --- a/mk/windows/vs2015-64/libzetaglest.vcxproj +++ b/mk/windows/vs2015-64/libzetaglest.vcxproj @@ -441,6 +441,7 @@ + diff --git a/mk/windows/vs2015-64/map_editor.vcxproj b/mk/windows/vs2015-64/map_editor.vcxproj index 8f2ed9f19..93d79763b 100644 --- a/mk/windows/vs2015-64/map_editor.vcxproj +++ b/mk/windows/vs2015-64/map_editor.vcxproj @@ -233,7 +233,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2015-64/zetaglest.vcxproj b/mk/windows/vs2015-64/zetaglest.vcxproj index 615e2726b..cb5670703 100644 --- a/mk/windows/vs2015-64/zetaglest.vcxproj +++ b/mk/windows/vs2015-64/zetaglest.vcxproj @@ -384,7 +384,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true diff --git a/mk/windows/vs2017-32/g3d_viewer.vcxproj b/mk/windows/vs2017-32/g3d_viewer.vcxproj index 259d4a7a9..5174579d4 100644 --- a/mk/windows/vs2017-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-32/g3d_viewer.vcxproj @@ -160,7 +160,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2017-32/libzetaglest.vcxproj b/mk/windows/vs2017-32/libzetaglest.vcxproj index 2008b28e0..af12e2ece 100644 --- a/mk/windows/vs2017-32/libzetaglest.vcxproj +++ b/mk/windows/vs2017-32/libzetaglest.vcxproj @@ -598,6 +598,7 @@ + diff --git a/mk/windows/vs2017-32/map_editor.vcxproj b/mk/windows/vs2017-32/map_editor.vcxproj index fbc72f8e6..526edcad9 100644 --- a/mk/windows/vs2017-32/map_editor.vcxproj +++ b/mk/windows/vs2017-32/map_editor.vcxproj @@ -157,7 +157,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2017-32/zetaglest.vcxproj b/mk/windows/vs2017-32/zetaglest.vcxproj index 910cb80e9..f5a5a35ae 100644 --- a/mk/windows/vs2017-32/zetaglest.vcxproj +++ b/mk/windows/vs2017-32/zetaglest.vcxproj @@ -470,7 +470,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies + ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies %(AdditionalUsingDirectories) NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true diff --git a/mk/windows/vs2017-64/g3d_viewer.vcxproj b/mk/windows/vs2017-64/g3d_viewer.vcxproj index 67ae06e2b..1974124f9 100644 --- a/mk/windows/vs2017-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-64/g3d_viewer.vcxproj @@ -238,7 +238,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2017-64/libzetaglest.vcxproj b/mk/windows/vs2017-64/libzetaglest.vcxproj index 8aedaae81..39a0c6498 100644 --- a/mk/windows/vs2017-64/libzetaglest.vcxproj +++ b/mk/windows/vs2017-64/libzetaglest.vcxproj @@ -444,6 +444,7 @@ + diff --git a/mk/windows/vs2017-64/map_editor.vcxproj b/mk/windows/vs2017-64/map_editor.vcxproj index 80c86b641..54fae909b 100644 --- a/mk/windows/vs2017-64/map_editor.vcxproj +++ b/mk/windows/vs2017-64/map_editor.vcxproj @@ -233,7 +233,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async diff --git a/mk/windows/vs2017-64/zetaglest.vcxproj b/mk/windows/vs2017-64/zetaglest.vcxproj index 8c978257b..f2ebf0fdc 100644 --- a/mk/windows/vs2017-64/zetaglest.vcxproj +++ b/mk/windows/vs2017-64/zetaglest.vcxproj @@ -384,7 +384,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index b44897205..dce32ab73 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -37,6 +37,7 @@ #include #include #include "common_scoped_ptr.h" +#include "versions.h" #ifndef WIN32 #include @@ -73,8 +74,6 @@ const char *folderDelimiter = "/"; //int GameConstants::updateFps= 40; //int GameConstants::cameraFps= 100; -const string g3dviewerVersionString = "v0.8.01"; - // Because g3d should always support alpha transparency string fileFormat = "png"; @@ -180,7 +179,7 @@ namespace Shared { } // "================================================================================" - printf("\n%s %s, [Using %s]\n", extractFileFromDirectoryPath(argv0).c_str(), g3dviewerVersionString.c_str(), (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING)); + printf("\n%s %s, [Using %s]\n", extractFileFromDirectoryPath(argv0).c_str(), G3D_VIEWER_VERSION, (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING)); printf("\nDisplays glest 3D-models and unit/projectile/splash particle systems.\n"); printf("\nRotate with left mouse button. Zoom with right mouse button or mousewheel."); @@ -293,7 +292,7 @@ namespace Shared { // class MainWindow // =============================================== - const string MainWindow::winHeader = "G3D viewer " + g3dviewerVersionString; + const string MainWindow::winHeader = string("ZetaGlest G3D viewer ") + G3D_VIEWER_VERSION; const float defaultspeed = 0.025f; diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index eb80c0ea8..2369bf8c3 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -32,23 +32,17 @@ #include "cache_manager.h" #include "errno.h" #include "leak_dumper.h" +#include "versions.h" using namespace Shared::Util; using namespace Shared::Platform; namespace Glest { namespace Game { - const char *mailString = "https://github.com/ZetaGlest"; - // !! Use minor versions !! Only major and minor version control compatibility! - // typical version numbers look like this: v0.8.01 - // don't forget to update file: source/version.txt - const string glestVersionString = "v0.8.02"; - const string lastCompatibleSaveGameVersionString = "v0.8.01"; - string getCrashDumpFileName() { - return "zetaglest" + glestVersionString + ".dmp"; + return (string("zetaglest") + GAME_VERSION) + ".dmp"; } string getPlatformTypeNameString() { static string platform; @@ -180,7 +174,7 @@ namespace Glest { static string version = ""; if (version == "") { version = - glestVersionString + "-" + getCompilerNameString() + "-" + + string(GAME_VERSION) + "-" + getCompilerNameString() + "-" + getCompileDateTime(); } return version; @@ -190,7 +184,7 @@ namespace Glest { static string version = ""; if (version == "") { version = - glestVersionString + getCompilerNameString(); + GAME_VERSION + getCompilerNameString(); } return version; } @@ -204,17 +198,17 @@ namespace Glest { } string getNetworkPlatformFreeVersionString() { - return glestVersionString; + return GAME_VERSION; } string getAboutString1(int i) { //case 1: return "Built: " + string(__DATE__) + " " + GIT_Rev; switch (i) { case 0: - return "ZetaGlest " + glestVersionString + " (" + + return string("ZetaGlest ") + GAME_VERSION + " (" + "Shared Library " + sharedLibVersionString + ")"; case 1: - return glestVersionString; + return GAME_VERSION; case 2: return "Copyright 2001-2010 The Glest Team"; case 3: diff --git a/source/glest_game/facilities/game_util.h b/source/glest_game/facilities/game_util.h index b46f64de8..19e210e0f 100644 --- a/source/glest_game/facilities/game_util.h +++ b/source/glest_game/facilities/game_util.h @@ -38,11 +38,7 @@ using Shared::Util::sharedLibVersionString; namespace Glest { namespace Game { - extern const char *mailString; - extern const string glestVersionString; - extern const string lastCompatibleSaveGameVersionString; - extern const string networkVersionString; void initSpecialStrings(); string getCrashDumpFileName(); diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index e848c7a1f..e9cf1cf35 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -41,7 +41,7 @@ #include "cache_manager.h" #include "conversion.h" #include "steam.h" - +#include "versions.h" #include "leak_dumper.h" using namespace Shared::Graphics; @@ -6838,7 +6838,7 @@ namespace Glest { #endif logFile << "World CRC debug information:" << std::endl; logFile << "============================" << std::endl; - logFile << "Software version: " << glestVersionString << "-" << + logFile << "Software version: " << GAME_VERSION << "-" << getCompilerNameString() << std::endl; logFile << "Maximum framecount: " << world. getFaction(0)->getCRC_DetailsForWorldFrameCount() << std::endl; @@ -8739,7 +8739,7 @@ namespace Glest { char szBuf[4096] = ""; strftime(szBuf, 4095, "%Y-%m-%d %H:%M:%S", &loctime); - rootNodeReplay->addAttribute("version", glestVersionString, + rootNodeReplay->addAttribute("version", GAME_VERSION, mapTagReplacements); rootNodeReplay->addAttribute("timestamp", szBuf, mapTagReplacements); @@ -8776,7 +8776,7 @@ namespace Glest { char szBuf[4096] = ""; strftime(szBuf, 4095, "%Y-%m-%d %H:%M:%S", &loctime); - rootNode->addAttribute("version", glestVersionString, + rootNode->addAttribute("version", GAME_VERSION, mapTagReplacements); rootNode->addAttribute("timestamp", szBuf, mapTagReplacements); @@ -9013,20 +9013,20 @@ namespace Glest { Lang & lang = Lang::getInstance(); string gameVer = versionNode->getAttribute("version")->getValue(); - if (gameVer != glestVersionString + if (gameVer != GAME_VERSION && checkVersionComptability(gameVer, - glestVersionString) == false) { + GAME_VERSION) == false) { char szBuf[8096] = ""; snprintf(szBuf, 8096, lang.getString("SavedGameBadVersion").c_str(), - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); throw megaglest_runtime_error(szBuf, true); } if (SystemFlags::VERBOSE_MODE_ENABLED) printf ("Found saved game version that matches your application version: [%s] --> [%s]\n", - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); XmlNode *gameNode = rootNode->getChild("Game"); @@ -9101,22 +9101,22 @@ namespace Glest { Lang & lang = Lang::getInstance(); string gameVer = versionNode->getAttribute("version")->getValue(); // this is the version check for loading normal save games from menu_state_load_game - if (gameVer != glestVersionString + if (gameVer != GAME_VERSION && (compareMajorMinorVersion - (gameVer, lastCompatibleSaveGameVersionString) < 0 - || compareMajorMinorVersion(glestVersionString, gameVer) < 0)) { + (gameVer, LAST_COMPATIBLE_VERSION) < 0 + || compareMajorMinorVersion(GAME_VERSION, gameVer) < 0)) { char szBuf[8096] = ""; snprintf(szBuf, 8096, lang.getString("SavedGameBadVersion").c_str(), - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); throw megaglest_runtime_error(szBuf, true); } if (SystemFlags::VERBOSE_MODE_ENABLED) printf ("Found saved game version that matches your application version: [%s] --> [%s]\n", - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); XmlNode *gameNode = rootNode->getChild("Game"); GameSettings newGameSettings; @@ -9129,13 +9129,13 @@ namespace Glest { XmlNode *statsNode = worldNode->getChild("Stats"); XmlNode *minimapNode = worldNode->getChild("Minimap"); - if (gameVer != glestVersionString + if (gameVer != GAME_VERSION && checkVersionComptability(gameVer, - glestVersionString) == false) { + GAME_VERSION) == false) { char szBuf[8096] = ""; snprintf(szBuf, 8096, lang.getString("SavedGameBadVersion").c_str(), - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); throw megaglest_runtime_error(szBuf, true); } // This is explored fog of war for the host player, clear it diff --git a/source/glest_game/main/intro.cpp b/source/glest_game/main/intro.cpp index bb1f6f9e6..e8fb69f50 100644 --- a/source/glest_game/main/intro.cpp +++ b/source/glest_game/main/intro.cpp @@ -495,7 +495,7 @@ namespace Glest { texts.push_back(new Text(lineText, Vec2i(-1, -1), disappear *(++displayItemNumber), coreData.getMenuFontVeryBig(),coreData.getMenuFontVeryBig3D())); texts.push_back(new Text(coreData.getLogoTexture(), Vec2i(w/2-128, h/2-64), Vec2i(256, 128), disappear *(++displayItemNumber))); - texts.push_back(new Text(glestVersionString, Vec2i(w/2+45, h/2-45), disappear *(displayItemNumber++), coreData.getMenuFontNormal(),coreData.getMenuFontNormal3D())); + texts.push_back(new Text(GAME_VERSION, Vec2i(w/2+45, h/2-45), disappear *(displayItemNumber++), coreData.getMenuFontNormal(),coreData.getMenuFontNormal3D())); lineText = "www.megaglest.org"; //texts.push_back(new Text(lineText, Vec2i(-1, -1), disappear *(displayItemNumber++), coreData.getMenuFontVeryBig(),coreData.getMenuFontVeryBig3D())); texts.push_back(new Text(lineText, Vec2i(-1, h/2-45-18), disappear *(displayItemNumber-1), coreData.getMenuFontVeryBig(),coreData.getMenuFontVeryBig3D())); diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index bed70c477..69bca3d72 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -60,6 +60,7 @@ #include "lua_script.h" #include "interpolation.h" #include "common_scoped_ptr.h" +#include "versions.h" // To handle signal catching #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__FreeBSD__) && !defined(BSD) @@ -5732,7 +5733,7 @@ namespace Properties::setApplicationPath(executable_path(argv[0])); Properties::setApplicationDataPath(executable_path(argv[0])); - Properties::setGameVersion(glestVersionString); + Properties::setGameVersion(GAME_VERSION); ServerSocket::setMaxPlayerCount(GameConstants::maxPlayers); @@ -5990,7 +5991,7 @@ namespace SwitchSetupRequest().getDataSize()); } - printf("\nversion: [%s]", glestVersionString.c_str()); + printf("\nversion: [%s]", GAME_VERSION); #ifdef USE_STREFLOP @@ -6023,8 +6024,6 @@ namespace #endif } - setGameVersion(glestVersionString); - #ifdef WIN32 CheckPacketThrottling(); #endif diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 26ab4c48c..0a31ef7f5 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -42,6 +42,7 @@ #include "map_preview.h" #include #include "compression_utils.h" +#include "versions.h" #include "leak_dumper.h" @@ -1310,7 +1311,7 @@ namespace Glest { config.getString("phpVersionParam", "?version=0.1"); string gameVersion = - "&glestVersion=" + SystemFlags::escapeURL(glestVersionString); + "&glestVersion=" + SystemFlags::escapeURL(GAME_VERSION); string playerUUID = "&uuid=" + diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index e76a78d03..d49619032 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -45,6 +45,7 @@ #include #include "map_preview.h" #include "gen_uuid.h" +#include "versions.h" #include "leak_dumper.h" namespace Glest { @@ -413,12 +414,8 @@ namespace Glest { serverPort + " / " + externalPort + " )"); ServerSocket::setExternalPort(strToInt(externalPort)); - if (EndsWith(glestVersionString, "-dev") == false) { - labelLocalGameVersion.setText(glestVersionString); - } else { - //labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); - labelLocalGameVersion.setText(glestVersionString); - } + //labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); + labelLocalGameVersion.setText(GAME_VERSION); xoffset = 65; // MapFilter @@ -1067,12 +1064,8 @@ namespace Glest { mainMessageBox.init(lang.getString("Ok"), 500, 300); - if (EndsWith(glestVersionString, "-dev") == false) { - labelLocalGameVersion.setText(glestVersionString); - } else { - //labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); - labelLocalGameVersion.setText(glestVersionString); - } + //labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); + labelLocalGameVersion.setText(GAME_VERSION); //vector teamItems, controlItems, results , rMultiplier; @@ -3611,7 +3604,7 @@ namespace Glest { Config::getInstance().getString("PlayerId", ""); //?status=waiting&system=linux&info=titus - publishToServerInfo["glestVersion"] = glestVersionString; + publishToServerInfo["glestVersion"] = GAME_VERSION; publishToServerInfo["platform"] = getPlatformNameString(); publishToServerInfo["binaryCompileDate"] = getCompileDateTime(); diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp index c49b9c75f..9555f0245 100644 --- a/source/glest_game/menu/menu_state_load_game.cpp +++ b/source/glest_game/menu/menu_state_load_game.cpp @@ -31,6 +31,7 @@ #include "network_message.h" #include "game.h" #include "auto_test.h" +#include "versions.h" #include "leak_dumper.h" @@ -398,14 +399,14 @@ namespace Glest { const XmlNode *versionNode = rootNode; string gameVer = versionNode->getAttribute("version")->getValue(); - if (gameVer != glestVersionString + if (gameVer != GAME_VERSION && checkVersionComptability(gameVer, - glestVersionString) == + GAME_VERSION) == false) { char szBuf[8096] = ""; snprintf(szBuf, 8096, lang.getString("SavedGameBadVersion").c_str(), - gameVer.c_str(), glestVersionString.c_str()); + gameVer.c_str(), GAME_VERSION); versionWarningLabel.setText(szBuf); } else { versionWarningLabel.setText(""); diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index 7c435743b..589f4b204 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -39,6 +39,7 @@ #include "masterserver_info.h" #include #include "cache_manager.h" +#include "versions.h" #include "leak_dumper.h" namespace Glest { @@ -403,7 +404,6 @@ namespace Glest { ircClient = ircThread; ircClient->setUniqueID(mutexOwnerId); ircClient->setPlayerName(netPlayerName); - ircClient->setGlestVersionString(glestVersionString); ircClient->start(); } else { if (SystemFlags::VERBOSE_MODE_ENABLED) @@ -1305,7 +1305,7 @@ namespace Glest { string versionURL = Config::getInstance().getString("VersionURL", "http://zetaglest.dreamhosters.com/files/versions/") - + glestVersionString + ".txt"; + + GAME_VERSION + ".txt"; //printf("\nversionURL=%s\n",versionURL.c_str()); if (versionURL != "") { safeMutex.ReleaseLock(true); diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp index 90d1e968a..3a81d4973 100644 --- a/source/glest_game/menu/menu_state_mods.cpp +++ b/source/glest_game/menu/menu_state_mods.cpp @@ -34,9 +34,9 @@ #include "cache_manager.h" // Need the include below for vc++ 2010 because Microsoft messed up their STL! #include +#include "versions.h" #include "leak_dumper.h" - namespace Glest { namespace Game { @@ -566,7 +566,7 @@ namespace Glest { SystemFlags::escapeURL(Config::getInstance(). getString("PlayerId", "")); string gameVersion = - "&glestVersion=" + SystemFlags::escapeURL(glestVersionString); + "&glestVersion=" + SystemFlags::escapeURL(GAME_VERSION); if (SystemFlags::VERBOSE_MODE_ENABLED) printf diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp index 485ef142d..829827a0d 100644 --- a/source/glest_game/menu/menu_state_root.cpp +++ b/source/glest_game/menu/menu_state_root.cpp @@ -39,6 +39,7 @@ #include "cache_manager.h" #include "steam.h" #include +#include "versions.h" #include "leak_dumper.h" @@ -79,15 +80,15 @@ namespace Glest { int buttonXPosition = (1000 - buttonWidth) / 2; - //labelVersion.registerGraphicComponent(containerName,"labelVersion"); + /*//labelVersion.registerGraphicComponent(containerName,"labelVersion"); if (EndsWith(glestVersionString, "-dev") == false) { labelVersion.init(525, yPos); labelVersion.setText(glestVersionString); - } else { + } else {*/ labelVersion.init(buttonXPosition, yPos); //labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); - labelVersion.setText(glestVersionString); - } + labelVersion.setText(GAME_VERSION); + //} labelGreeting.init(labelVersion.getX(), labelVersion.getY() - 16); labelGreeting.setText(""); @@ -226,12 +227,8 @@ namespace Glest { console.resetFonts(); - if (EndsWith(glestVersionString, "-dev") == false) { - labelVersion.setText(glestVersionString); - } else { - //labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); - labelVersion.setText(glestVersionString); - } + //labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); + labelVersion.setText(GAME_VERSION); buttonNewGame.setText(lang.getString("NewGame")); buttonLoadGame.setText(lang.getString("LoadGame")); @@ -851,18 +848,18 @@ namespace Glest { props.loadFromText(updateMetaData); int compareResult = - compareMajorMinorVersion(glestVersionString, + compareMajorMinorVersion(GAME_VERSION, props.getString("LatestGameVersion", "")); if (compareResult == 0) { - if (glestVersionString != + if (GAME_VERSION != props.getString("LatestGameVersion", "")) { compareResult = -1; } } if (SystemFlags::VERBOSE_MODE_ENABLED) printf("compareResult = %d local [%s] remote [%s]\n", - compareResult, glestVersionString.c_str(), + compareResult, GAME_VERSION, props.getString("LatestGameVersion", "").c_str()); if (compareResult < 0) { diff --git a/source/glest_game/menu/server_line.cpp b/source/glest_game/menu/server_line.cpp index fdb5db0c6..d078ebcd7 100644 --- a/source/glest_game/menu/server_line.cpp +++ b/source/glest_game/menu/server_line.cpp @@ -29,6 +29,7 @@ #include "metrics.h" #include "auto_test.h" #include "masterserver_info.h" +#include "versions.h" #include "leak_dumper.h" @@ -194,7 +195,7 @@ namespace Glest { //printf("glestVersionString [%s] masterServerInfo->getGlestVersion() [%s]\n",glestVersionString.c_str(),masterServerInfo->getGlestVersion().c_str()); compatible = - checkVersionComptability(glestVersionString, + checkVersionComptability(GAME_VERSION, masterServerInfo.getGlestVersion()); selectButton.setEnabled(compatible); selectButton.setEditable(compatible); diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index c378fbf82..69e8ae44c 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -40,6 +40,7 @@ #include #include #include +#include "versions.h" #include "leak_dumper.h" @@ -2826,7 +2827,7 @@ namespace Glest { } } publishToServerInfo["uuid"] = Config::getInstance().getString("PlayerId", ""); - publishToServerInfo["glestVersion"] = glestVersionString; + publishToServerInfo["glestVersion"] = GAME_VERSION; publishToServerInfo["platform"] = getPlatformNameString(); publishToServerInfo["binaryCompileDate"] = getCompileDateTime(); publishToServerInfo["serverTitle"] = this->getGameSettings()->getGameName(); diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index 2128f687c..6addff071 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -33,6 +33,7 @@ #include #endif #include "common_scoped_ptr.h" +#include "versions.h" //#include using namespace Shared::Util; @@ -59,9 +60,7 @@ namespace Glest { } namespace MapEditor { - - const string mapeditorVersionString = "v0.8.01"; - const string MainWindow::winHeader = "ZetaGlest Map Editor " + mapeditorVersionString; + const string MainWindow::winHeader = string("ZetaGlest Map Editor ") + MAP_EDITOR_VERSION; // =============================================== // class Global functions @@ -1649,7 +1648,7 @@ wxT("Help")).ShowModal(); string fileparam; if (argc == 2) { if (argv[1][0] == '-') { // any flag gives help and exits program. - std::cout << std::endl << "ZetaGlest map editor " << mapeditorVersionString << " [Using " << (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl; + std::cout << std::endl << "ZetaGlest Map Editor " << MAP_EDITOR_VERSION << " [Using " << (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl; //std::cout << "\nglest_map_editor [MGM FILE]" << std::endl << std::endl; std::cout << "Creates or edits zetaglest/glest maps. [.zgm/.mgm/.gbm]" << std::endl << std::endl; std::cout << "Draw with left mouse button." << std::endl; diff --git a/source/shared_lib/include/platform/posix/ircclient.h b/source/shared_lib/include/platform/posix/ircclient.h index 94a01f113..db18af532 100644 --- a/source/shared_lib/include/platform/posix/ircclient.h +++ b/source/shared_lib/include/platform/posix/ircclient.h @@ -80,7 +80,6 @@ namespace Shared { string nick; string playerName; - string glestVersionString; bool hasJoinedChannel; @@ -113,9 +112,6 @@ namespace Shared { void setPlayerName(string value) { playerName = value; } - void setGlestVersionString(string value) { - glestVersionString = value; - } string getPlayerName() const { return playerName; } diff --git a/source/shared_lib/include/versions.h b/source/shared_lib/include/versions.h new file mode 100644 index 000000000..11bf7ed89 --- /dev/null +++ b/source/shared_lib/include/versions.h @@ -0,0 +1,4 @@ +#define GAME_VERSION "0.8.02" +#define LAST_COMPATIBLE_VERSION "0.8.01" +#define G3D_VIEWER_VERSION "1.0.00" +#define MAP_EDITOR_VERSION "1.0.00" diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp index 721049e39..a0c7ce0db 100644 --- a/source/shared_lib/sources/platform/posix/ircclient.cpp +++ b/source/shared_lib/sources/platform/posix/ircclient.cpp @@ -38,6 +38,7 @@ #include #include #include "conversion.h" +#include "versions.h" using namespace Shared::Util; using namespace Shared::PlatformCommon; @@ -552,7 +553,6 @@ namespace Shared { lastNickListUpdate = time(NULL); wantToLeaveChannel = false; playerName = ""; - glestVersionString = ""; } void IRCThread::disconnect() { @@ -837,7 +837,7 @@ namespace Shared { if (SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf("===> IRC: Line: %d\n", __LINE__); safeMutex.Lock(); - if (irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), ("ZetaGlest " + glestVersionString).c_str())) { + if (irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), (string("ZetaGlest ") + GAME_VERSION).c_str())) { safeMutex.ReleaseLock(); if (SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf("===> IRC Could not connect: %s\n", irc_strerror(irc_errno(ircSession))); return; diff --git a/source/version.txt b/source/version.txt deleted file mode 100644 index f414d8e33..000000000 --- a/source/version.txt +++ /dev/null @@ -1,12 +0,0 @@ -# How it currently works? -# Set version here (only here) and just start mk/linux/mg-version-synch.sh script. -# Versions will be updated everywhere automatically. -# Then you should commit changed files and that's all. - -CurrentGameVersion = "0.8.02"; - -OldReleaseGameVersion = "0.8.01"; -LastCompatibleSaveGameVersion = "0.8.01"; - -#This property is deprecated. Do not use -GitCommitForRelease = "5733.147264d";