diff --git a/mk/windoze/Glest.sln b/mk/windoze/Glest.sln
index 73b2a3ea7..5223d02e2 100755
--- a/mk/windoze/Glest.sln
+++ b/mk/windoze/Glest.sln
@@ -7,6 +7,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vc
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "shared_lib.vcproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} = {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_editor", "glest_editor.vcproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -25,33 +28,98 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug+MT|Win32 = Debug+MT|Win32
+		No debug|Win32 = No debug|Win32
+		Release with error catching|Win32 = Release with error catching|Win32
 		Release|Win32 = Release|Win32
+		Release+MT with error catching|Win32 = Release+MT with error catching|Win32
+		Syncdebug|Win32 = Syncdebug|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Debug|Win32.Build.0 = Debug|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.No debug|Win32.ActiveCfg = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.No debug|Win32.Build.0 = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release with error catching|Win32.Build.0 = Release|Win32
 		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|Win32.ActiveCfg = Release|Win32
 		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|Win32.Build.0 = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Syncdebug|Win32.Build.0 = Release|Win32
 		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Debug|Win32.Build.0 = Debug|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.No debug|Win32.ActiveCfg = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.No debug|Win32.Build.0 = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release with error catching|Win32.Build.0 = Release|Win32
 		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release|Win32.ActiveCfg = Release|Win32
 		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release|Win32.Build.0 = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}.Syncdebug|Win32.Build.0 = Release|Win32
 		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Debug|Win32.Build.0 = Debug|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.No debug|Win32.ActiveCfg = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.No debug|Win32.Build.0 = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release with error catching|Win32.Build.0 = Release|Win32
 		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release|Win32.ActiveCfg = Release|Win32
 		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release|Win32.Build.0 = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}.Syncdebug|Win32.Build.0 = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug|Win32.Build.0 = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.No debug|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.No debug|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release with error catching|Win32.Build.0 = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release|Win32.ActiveCfg = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Syncdebug|Win32.Build.0 = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug|Win32.Build.0 = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.No debug|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.No debug|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release with error catching|Win32.Build.0 = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.ActiveCfg = Release|Win32
 		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Syncdebug|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}.Debug+MT|Win32.ActiveCfg = Debug|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug+MT|Win32.Build.0 = Debug|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.No debug|Win32.ActiveCfg = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.No debug|Win32.Build.0 = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release with error catching|Win32.ActiveCfg = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release with error catching|Win32.Build.0 = Release|Win32
 		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
 		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release+MT with error catching|Win32.Build.0 = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Syncdebug|Win32.ActiveCfg = Release|Win32
+		{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Syncdebug|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo
index 68548b36d..374adcb4b 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 4f305a04b..5a2f2fb15 100755
--- a/mk/windoze/g3d_viewer.vcproj
+++ b/mk/windoze/g3d_viewer.vcproj
@@ -118,6 +118,8 @@
 				Name="VCCLCompilerTool"
 				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\platform\sdl;../../source/shared_lib/include/streflop"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
+				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
diff --git a/mk/windoze/glest_configurator.vcproj b/mk/windoze/glest_configurator.vcproj
index d7713a137..8b89128d3 100644
--- a/mk/windoze/glest_configurator.vcproj
+++ b/mk/windoze/glest_configurator.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="glest_configurator"
 	ProjectGUID="{FE5C7C7C-F109-44F5-8329-19A4E24F162D}"
+	RootNamespace="glest_configurator"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="0"
 	>
@@ -117,6 +118,8 @@
 				Name="VCCLCompilerTool"
 				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"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
+				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
diff --git a/mk/windoze/glest_editor.vcproj b/mk/windoze/glest_editor.vcproj
index 61deb7fc4..b21277d95 100755
--- a/mk/windoze/glest_editor.vcproj
+++ b/mk/windoze/glest_editor.vcproj
@@ -118,6 +118,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw";"..\..\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\platform\sdl;../../source/shared_lib/include/streflop"
 				PreprocessorDefinitions="MWIN;__WXMSW__"
+				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
diff --git a/mk/windoze/glest_game.vcproj b/mk/windoze/glest_game.vcproj
index a07c4eb77..d3daf1728 100755
--- a/mk/windoze/glest_game.vcproj
+++ b/mk/windoze/glest_game.vcproj
@@ -133,15 +133,18 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
+				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"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32"
 				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="0"
 				WarningLevel="2"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -156,12 +159,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib sdl.lib sdlmain.lib winmm.lib openal32.lib iphlpapi.lib libstreflop.lib"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;;../../source/shared_lib/sources/streflop/libstreflop"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="false"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				LinkTimeCodeGeneration="0"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/mk/windoze/libstreflop.vcproj b/mk/windoze/libstreflop.vcproj
index 1c3b941bd..1d2b3d193 100644
--- a/mk/windoze/libstreflop.vcproj
+++ b/mk/windoze/libstreflop.vcproj
@@ -111,14 +111,18 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="&quot;..\..\source\shared_lib\include\streflop\libm\flt-32&quot;;..\..\source\shared_lib\include\streflop\libm\headers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32"
+				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="0"
+				RuntimeTypeInfo="true"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -159,263 +163,263 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\libm\flt-32\e_acosf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_acosf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_acoshf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_acoshf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_asinf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_asinf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_atan2f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_atan2f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_atanhf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_atanhf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_coshf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_coshf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_exp2f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_exp2f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_expf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_expf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_fmodf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_fmodf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_gammaf_r.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_gammaf_r.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_hypotf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_hypotf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_j0f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_j0f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_j1f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_j1f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_jnf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_jnf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_lgammaf_r.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_lgammaf_r.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_log10f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_log10f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_log2f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_log2f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_logf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_logf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_powf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_powf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_rem_pio2f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_rem_pio2f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_remainderf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_remainderf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_sinhf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_sinhf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\e_sqrtf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\e_sqrtf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\k_cosf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\k_cosf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\k_rem_pio2f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\k_rem_pio2f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\k_sinf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\k_sinf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\k_tanf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\k_tanf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_asinhf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_asinhf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_atanf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_atanf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_cbrtf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_cbrtf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_ceilf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_ceilf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_copysignf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_copysignf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_cosf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_cosf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_erff.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_erff.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_expm1f.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_expm1f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_fabsf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_fabsf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_finitef.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_finitef.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_floorf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_floorf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_fpclassifyf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_fpclassifyf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_frexpf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_frexpf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_ilogbf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_ilogbf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_isinff.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_isinff.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_isnanf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_isnanf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_ldexpf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_ldexpf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_llrintf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_llrintf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_llroundf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_llroundf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_log1pf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_log1pf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_logbf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_logbf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_lrintf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_lrintf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_lroundf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_lroundf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_modff.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_modff.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_nearbyintf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_nearbyintf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_nextafterf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_nextafterf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_remquof.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_remquof.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_rintf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_rintf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_roundf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_roundf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_scalblnf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_scalblnf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_scalbnf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_scalbnf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_signbitf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_signbitf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_sincosf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_sincosf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_sinf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_sinf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_tanf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_tanf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_tanhf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_tanhf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\s_truncf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\s_truncf.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libm\flt-32\w_expf.cpp"
+				RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\w_expf.cpp"
 				>
 			</File>
 		</Filter>
@@ -424,38 +428,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\endian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\features.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\ieee754.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\math.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\math_private.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\SMath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\flt-32\t_exp2f.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\streflop\libm\headers\wchar.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -464,7 +436,7 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\libm\flt-32\Makefile"
+			RelativePath="..\..\source\shared_lib\sources\streflop\libm\flt-32\Makefile"
 			>
 		</File>
 	</Files>
diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj
index 04e483ed9..5c275e0a4 100755
--- a/mk/windoze/shared_lib.vcproj
+++ b/mk/windoze/shared_lib.vcproj
@@ -113,14 +113,18 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				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;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/libpng141;&quot;../../source/win32_deps/jpeg-8a&quot;;&quot;../../source/win32_deps/SDL-1.2.14/include&quot;;../../source/shared_lib/include/platform/sdl;&quot;../../source/win32_deps/openal-soft-1.12.854/include&quot;;../../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"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_X87;LIBM_COMPILING_FLT32"
+				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
+				EnableEnhancedInstructionSet="0"
+				FloatingPointModel="0"
+				RuntimeTypeInfo="true"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool