Statically link against SFML instead of dynamically

#117

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 82b726f6c192f3a3fe766a51ed5a90d9842a6c13..4a558139e8027b4bda531d34867ade1f26459a96 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -93,7 +93,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_DEBUG;SFML_DYNAMIC;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <SmallerTypeCheck>true</SmallerTypeCheck>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -119,7 +119,7 @@
       <FunctionLevelLinking>\r
       </FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;SFML_DYNAMIC;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -152,7 +152,7 @@
       <FunctionLevelLinking>\r
       </FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;SFML_DYNAMIC;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -183,7 +183,7 @@
       <FunctionLevelLinking>\r
       </FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;SFML_DYNAMIC;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r

diff --git a/dependencies/SFML-1.6/lib/sfml-audio-d.dll b/dependencies/SFML-1.6/lib/sfml-audio-d.dll
deleted file mode 100644 (file)
index 3d6b4f7..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-audio-d.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-audio-d.lib b/dependencies/SFML-1.6/lib/sfml-audio-d.lib
deleted file mode 100644 (file)
index 329b157..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-audio-d.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-audio-s-d.lib b/dependencies/SFML-1.6/lib/sfml-audio-s-d.lib
new file mode 100644 (file)
index 0000000..e2d0b88
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-audio-s-d.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-audio-s.lib b/dependencies/SFML-1.6/lib/sfml-audio-s.lib
new file mode 100644 (file)
index 0000000..bec8129
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-audio-s.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-audio.dll b/dependencies/SFML-1.6/lib/sfml-audio.dll
deleted file mode 100644 (file)
index f4ab81b..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-audio.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-audio.lib b/dependencies/SFML-1.6/lib/sfml-audio.lib
deleted file mode 100644 (file)
index 3a38475..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-audio.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics-d.dll b/dependencies/SFML-1.6/lib/sfml-graphics-d.dll
deleted file mode 100644 (file)
index 1f93bc6..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-graphics-d.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics-d.lib b/dependencies/SFML-1.6/lib/sfml-graphics-d.lib
deleted file mode 100644 (file)
index 5507bae..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-graphics-d.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics-s-d.lib b/dependencies/SFML-1.6/lib/sfml-graphics-s-d.lib
new file mode 100644 (file)
index 0000000..7e2ae89
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-graphics-s-d.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics-s.lib b/dependencies/SFML-1.6/lib/sfml-graphics-s.lib
new file mode 100644 (file)
index 0000000..e05be9a
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-graphics-s.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics.dll b/dependencies/SFML-1.6/lib/sfml-graphics.dll
deleted file mode 100644 (file)
index c73dba6..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-graphics.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-graphics.lib b/dependencies/SFML-1.6/lib/sfml-graphics.lib
deleted file mode 100644 (file)
index 703fb57..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-graphics.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system-d.dll b/dependencies/SFML-1.6/lib/sfml-system-d.dll
deleted file mode 100644 (file)
index c439c59..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-system-d.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system-d.lib b/dependencies/SFML-1.6/lib/sfml-system-d.lib
deleted file mode 100644 (file)
index 05213cf..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-system-d.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system-s-d.lib b/dependencies/SFML-1.6/lib/sfml-system-s-d.lib
new file mode 100644 (file)
index 0000000..e509d25
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-system-s-d.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system-s.lib b/dependencies/SFML-1.6/lib/sfml-system-s.lib
new file mode 100644 (file)
index 0000000..ee871f3
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-system-s.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system.dll b/dependencies/SFML-1.6/lib/sfml-system.dll
deleted file mode 100644 (file)
index 56fbf8e..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-system.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-system.lib b/dependencies/SFML-1.6/lib/sfml-system.lib
deleted file mode 100644 (file)
index 190a7bd..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-system.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window-d.dll b/dependencies/SFML-1.6/lib/sfml-window-d.dll
deleted file mode 100644 (file)
index 395b9f6..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-window-d.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window-d.lib b/dependencies/SFML-1.6/lib/sfml-window-d.lib
deleted file mode 100644 (file)
index 1b5a0b0..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-window-d.lib and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window-s-d.lib b/dependencies/SFML-1.6/lib/sfml-window-s-d.lib
new file mode 100644 (file)
index 0000000..94f6fd8
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-window-s-d.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window-s.lib b/dependencies/SFML-1.6/lib/sfml-window-s.lib
new file mode 100644 (file)
index 0000000..1c16368
Binary files /dev/null and b/dependencies/SFML-1.6/lib/sfml-window-s.lib differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window.dll b/dependencies/SFML-1.6/lib/sfml-window.dll
deleted file mode 100644 (file)
index 28ea7cf..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-window.dll and /dev/null differ

diff --git a/dependencies/SFML-1.6/lib/sfml-window.lib b/dependencies/SFML-1.6/lib/sfml-window.lib
deleted file mode 100644 (file)
index 2d40ba9..0000000
Binary files a/dependencies/SFML-1.6/lib/sfml-window.lib and /dev/null differ

diff --git a/modules/ogl/ogl.vcxproj b/modules/ogl/ogl.vcxproj
index b9e33c624a4614e36a8bd06a5682b934e80ef769..6c12ff8984e0af64f7565d319075e02348f23b55 100644 (file)
--- a/modules/ogl/ogl.vcxproj
+++ b/modules/ogl/ogl.vcxproj
@@ -151,7 +151,7 @@
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-window-s.lib;sfml-graphics-s.lib;OpenGL32.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 7e103340a9a98de0a46b5f98ceba8cb88cf72214..5319aced73e890c62f8b4431bf2e76a48aea9f2a 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -180,11 +180,11 @@
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>sfml-system-d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-system-s-d.lib;sfml-audio-s-d.lib;sfml-window-s-d.lib;sfml-graphics-s-d.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>false</GenerateMapFile>\r
@@ -204,7 +204,6 @@ copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
-copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>\r
@@ -240,11 +239,11 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-system.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-system-s.lib;sfml-audio-s.lib;sfml-window-s.lib;sfml-graphics-s.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <GenerateMapFile>true</GenerateMapFile>\r
       <MapExports>true</MapExports>\r
@@ -267,7 +266,6 @@ copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
-copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>\r
@@ -303,11 +301,11 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-system.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-system-s.lib;sfml-audio-s.lib;sfml-window-s.lib;sfml-graphics-s.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <GenerateMapFile>false</GenerateMapFile>\r
       <MapExports>false</MapExports>\r
@@ -329,7 +327,6 @@ copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
-copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>\r
@@ -365,11 +362,11 @@ copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-system.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-system-s.lib;sfml-audio-s.lib;sfml-window-s.lib;sfml-graphics-s.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avdevice.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <GenerateMapFile>false</GenerateMapFile>\r
       <MapExports>false</MapExports>\r
@@ -391,7 +388,6 @@ copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"
 copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
-copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"</Command>\r