diff --git a/mk/windoze/CopyWindowsRuntimeDlls.bat b/mk/windoze/CopyWindowsRuntimeDlls.bat
index c54532e6..4b59dafb 100644
--- a/mk/windoze/CopyWindowsRuntimeDlls.bat
+++ b/mk/windoze/CopyWindowsRuntimeDlls.bat
@@ -1,6 +1,6 @@
@echo off
-if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\
+rem if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\xerces-c_3_0.dll copy xerces-c_3_0.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\libpng14.dll copy libpng14.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\zlib1.dll copy zlib1.dll ..\..\data\glest_game\
diff --git a/mk/windoze/Glest.sln b/mk/windoze/Glest.sln
index 5d8a8778..73b2a3ea 100755
--- a/mk/windoze/Glest.sln
+++ b/mk/windoze/Glest.sln
@@ -20,6 +20,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_configurator", "glest_configurator.vcproj", "{FE5C7C7C-F109-44F5-8329-19A4E24F162D}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -46,6 +48,10 @@ Global
{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug|Win32.Build.0 = Debug|Win32
{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.ActiveCfg = Release|Win32
{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.Build.0 = Release|Win32
+ {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.Build.0 = Debug|Win32
+ {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
+ {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index c6253989..68548b36 100755
Binary files a/mk/windoze/Glest.suo and b/mk/windoze/Glest.suo differ
diff --git a/mk/windoze/g3d_viewer.vcproj b/mk/windoze/g3d_viewer.vcproj
index 774e41f0..4f305a04 100755
--- a/mk/windoze/g3d_viewer.vcproj
+++ b/mk/windoze/g3d_viewer.vcproj
@@ -4,6 +4,7 @@
Version="9.00"
Name="g3d_viewer"
ProjectGUID="{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
+ RootNamespace="g3d_viewer"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
@@ -115,7 +116,7 @@
/>
+
+
+
+
diff --git a/mk/windoze/libstreflop.vcproj b/mk/windoze/libstreflop.vcproj
new file mode 100644
index 00000000..1c3b941b
--- /dev/null
+++ b/mk/windoze/libstreflop.vcproj
@@ -0,0 +1,473 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj
index 842d7d5d..04e483ed 100755
--- a/mk/windoze/shared_lib.vcproj
+++ b/mk/windoze/shared_lib.vcproj
@@ -113,11 +113,11 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- 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"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1"
+ 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"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="1"
FloatingPointModel="2"
RuntimeTypeInfo="false"
WarningLevel="3"
@@ -134,6 +134,8 @@
/>
+
+
+
+
+
+
@@ -332,7 +346,7 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -726,7 +776,7 @@
>
+
+#include "randomgen.h"
+
+using Shared::Util::RandomGen;
+
+namespace Glest{ namespace Game{
+
+class Program;
+class MainMenu;
+class MenuStateScenario;
+class Game;
+
+// =====================================================
+// class AutoTest
+//
+/// Interface to write log files
+// =====================================================
+
+class AutoTest{
+private:
+ int gameStartTime;
+ RandomGen random;
+
+private:
+ static const time_t invalidTime;
+ static const time_t gameTime;
+
+public:
+ static AutoTest & getInstance();
+ AutoTest();
+
+ void updateIntro(Program *program);
+ void updateRoot(Program *program, MainMenu *mainMenu);
+ void updateNewGame(Program *program, MainMenu *mainMenu);
+ void updateScenario(MenuStateScenario *menuStateScenario);
+ void updateGame(Game *game);
+ void updateBattleEnd(Program *program);
+};
+
+}}//end namespace
+
+#endif
diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index 2f484f14..c29f8b77 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -24,7 +24,7 @@
#include "opengl.h"
#include "faction.h"
#include "factory_repository.h"
-#include
+//#include
#include "leak_dumper.h"
diff --git a/source/glest_game/gui/gui.h b/source/glest_game/gui/gui.h
index 1ee95a70..1d44a59a 100644
--- a/source/glest_game/gui/gui.h
+++ b/source/glest_game/gui/gui.h
@@ -18,10 +18,10 @@
#include "commander.h"
#include "console.h"
#include "selection.h"
-#include "random.h"
+#include "randomgen.h"
#include