From f70f0cc89659576c535024d6bf0756e8e2811fa5 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 1 Jun 2010 01:17:37 +0000 Subject: [PATCH] - a few changes to properly compile in win32 --- mk/windoze/Glest.suo | Bin 264192 -> 264704 bytes mk/windoze/glest_game.vcproj | 4 ++-- mk/windoze/libstreflop.vcproj | 4 ++-- mk/windoze/shared_lib.vcproj | 4 ++-- source/shared_lib/include/util/randomgen.h | 7 ++++++- source/shared_lib/sources/util/randomgen.cpp | 3 +-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index 6b144f5e4b5b00dffa628caf4e74b6ff78820349..46682f3b0e829c83ba95fecd97d0306a4561f1bb 100755 GIT binary patch delta 16093 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 delta 14907 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 C&J`B` diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj index 04521431f..a91fe5bbb 100755 --- a/mk/windoze/glest_game.vcproj +++ b/mk/windoze/glest_game.vcproj @@ -46,7 +46,7 @@ WholeProgramOptimization="false" AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/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/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../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/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/SDL-1.2.14/include";../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;"../../source/win32_deps/openal-soft-1.12.854/include";../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;$(NOINHERIT)" AdditionalUsingDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;XML_LIBRARY;NO_GL_ASSERTIONS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32" + PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;XML_LIBRARY;NO_GL_ASSERTIONS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -137,7 +137,7 @@ WholeProgramOptimization="false" AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/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/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/tinyxml;../../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/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/win32_deps/include;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/SDL-1.2.14/include";../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;"../../source/win32_deps/openal-soft-1.12.854/include";../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;"../../source/win32_deps/curl-7.20.1/include";$(NOINHERIT)" AdditionalUsingDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32;CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="0" diff --git a/mk/windoze/libstreflop.vcproj b/mk/windoze/libstreflop.vcproj index c8b7075c7..217687116 100644 --- a/mk/windoze/libstreflop.vcproj +++ b/mk/windoze/libstreflop.vcproj @@ -114,7 +114,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="false" AdditionalIncludeDirectories=""..\..\source\shared_lib\include\streflop\libm\flt-32";..\..\source\shared_lib\include\streflop\libm\headers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="0" @@ -186,7 +186,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="false" AdditionalIncludeDirectories=""..\..\source\shared_lib\include\streflop\libm\flt-32";..\..\source\shared_lib\include\streflop\libm\headers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="0" diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj index 771a9916b..babc23281 100755 --- a/mk/windoze/shared_lib.vcproj +++ b/mk/windoze/shared_lib.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../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/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude";../../source/win32_deps/libpng141;"../../source/win32_deps/jpeg-8a";"../../source/win32_deps/SDL-1.2.14/include";../../source/shared_lib/include/platform/sdl;"../../source/win32_deps/openal-soft-1.12.854/include";../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NO_GL_ASSERTIONS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NO_GL_ASSERTIONS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -116,7 +116,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="false" AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../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/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;"../../source/win32_deps/xerces-c-3.0.1/src";"../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude";../../source/win32_deps/libpng141;"../../source/win32_deps/jpeg-8a";"../../source/win32_deps/SDL-1.2.14/include";../../source/shared_lib/include/platform/sdl;"../../source/win32_deps/openal-soft-1.12.854/include";../../source/shared_lib/include/sound/openal;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/streflop/libm_flt32_source;../../source/shared_lib/include/platform/common;"../../source/win32_deps/curl-7.20.1/include"" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32;CURL_STATICLIB" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB" StringPooling="true" ExceptionHandling="2" RuntimeLibrary="0" diff --git a/source/shared_lib/include/util/randomgen.h b/source/shared_lib/include/util/randomgen.h index e05de3fd9..833e43621 100644 --- a/source/shared_lib/include/util/randomgen.h +++ b/source/shared_lib/include/util/randomgen.h @@ -12,6 +12,8 @@ #ifndef _SHARED_UTIL_RANDOM_H_ #define _SHARED_UTIL_RANDOM_H_ +#include "math_wrapper.h" + namespace Shared { namespace Util { // ===================================================== @@ -26,7 +28,10 @@ private: private: int lastNumber; - +#ifdef USE_STREFLOP + streflop::RandomState randomState; +#endif + public: RandomGen(); void init(int seed); diff --git a/source/shared_lib/sources/util/randomgen.cpp b/source/shared_lib/sources/util/randomgen.cpp index 43489982c..43e8d4e9b 100644 --- a/source/shared_lib/sources/util/randomgen.cpp +++ b/source/shared_lib/sources/util/randomgen.cpp @@ -1,7 +1,6 @@ #include "randomgen.h" #include #include "util.h" -#include "math_wrapper.h" #include "leak_dumper.h" namespace Shared { namespace Util { @@ -65,7 +64,7 @@ float RandomGen::randRange(float min, float max){ assert(min<=max); #ifdef USE_STREFLOP - float res = streflop::Random(min, max); // streflop + float res = streflop::Random(min, max, randomState); // streflop #else float rand01= static_cast(RandomGen::rand())/(m-1); float res= min+((max-min)*rand01);