X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fshell.vcxproj;h=c11714eb9ca2648efd9866a4722f8d5e30eb82fb;hb=4fa80cdfed560bc1a80f1adc20785ae7c78d1d9a;hp=1c984a7c8d45c8ef4b84cd13f5fa318971788999;hpb=d7eb87d99d5780c8aca85ec7659313761de538f3;p=casparcg diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj index 1c984a7c8..c11714eb9 100644 --- a/shell/shell.vcxproj +++ b/shell/shell.vcxproj @@ -1,19 +1,31 @@  + + Profile + Win32 + Debug Win32 + + Develop + Win32 + Release Win32 + NotUsing + NotUsing + NotUsing NotUsing + false @@ -23,11 +35,47 @@ {79388c20-6499-4bf6-b8b9-d8c33d7d4ddd} + + {69313d25-9f54-4fc9-9872-628a4dd79464} + + + {d3611658-8f54-43cf-b9af-a5cf8c1102ea} + + + {f6223af3-be0b-4b61-8406-98922ce521c2} + + + {816deaba-3757-4306-afe0-c27cf96c4dea} + + + {3e11ff65-a9da-4f80-87f2-a7c6379ed5e2} + + + {82ed7ed6-8a15-40ec-a8af-f5e712e0da68} + + + {88f974f0-d09f-4788-8cf8-f563209e60c1} + + + {36a2d15a-41d3-485c-bc70-187b7fc6e6c4} + + + {2040b361-1fb6-488e-84a5-38a580da90de} + - + Designer + + + + + + + + + {8C26C94F-8092-4769-8D84-DEA479721C5B} @@ -46,6 +94,18 @@ true Unicode + + Application + false + true + Unicode + + + Application + false + true + Unicode + @@ -55,26 +115,48 @@ + + + + + + <_ProjectFileVersion>10.0.30319.1 - debug\ - release\ - ..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath) - ..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath) - ..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath) - ..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath) - $(ProjectDir)debug\ - $(ProjectDir)release\ + $(SolutionDir)tmp\$(Configuration)\ + $(SolutionDir)tmp\$(Configuration)\ + $(SolutionDir)tmp\$(Configuration)\ + $(SolutionDir)tmp\$(Configuration)\ + ..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath) + ..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath) + ..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath) + ..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\dependencies\boost\;..\dependencies\ffmpeg 0.8\include\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\include;..\dependencies\SFML-1.6\include\;..\dependencies\tbb\include\;$(IncludePath) + C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;..\dependencies\portaudio\lib;$(LibraryPath) + C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;..\dependencies\portaudio\lib;$(LibraryPath) + C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;..\dependencies\portaudio\lib;$(LibraryPath) + C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\stage\lib\;..\dependencies\ffmpeg 0.8\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;..\dependencies\zlib\lib;..\dependencies\portaudio\lib;$(LibraryPath) + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ $(SolutionName) $(SolutionName) + $(SolutionName) + $(SolutionName) - false + true false + + true + + + true + @@ -86,27 +168,29 @@ false Async EnableFastChecks - true + false MultiThreadedDebugDLL NotSet true NotUsing true - Level3 + Level4 EditAndContinue - _CRT_SECURE_NO_WARNINGS;TBB_USE_THREADING_TOOLS=1;%(PreprocessorDefinitions) + TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;COMPILE_DEBUG;%(PreprocessorDefinitions) true true + Fast + common/compiler/vs/disable_silly_warnings.h - BlueHancUtils_d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(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;portaudio_x86.lib %(AdditionalLibraryDirectories) - LIBC.LIB;%(IgnoreSpecificDefaultLibraries) + LIBC.lib;libcmt.lib true $(TargetDir)$(TargetName).pdb - true + false Console @@ -114,10 +198,19 @@ MachineX86 + Default + false - - + copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\portaudio\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)" @@ -136,23 +229,25 @@ StreamingSIMDExtensions2 true NotUsing - Level3 + Level4 ProgramDatabase true - NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_RELEASE;%(PreprocessorDefinitions) true true + Fast + common/compiler/vs/disable_silly_warnings.h - BlueHancUtils.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(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;portaudio_x86.lib %(AdditionalLibraryDirectories) - LIBC.lib + LIBC.lib;libcmt.lib true true true @@ -166,12 +261,143 @@ MachineX86 - - + UseLinkTimeCodeGeneration + true + copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\portaudio\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)" + + + + + + + MaxSpeed + Disabled + true + Speed + ../ + Async + MultiThreadedDLL + StreamingSIMDExtensions2 + true + NotUsing + Level4 + ProgramDatabase + true + TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_PROFILE;%(PreprocessorDefinitions) + false + true + Fast + common/compiler/vs/disable_silly_warnings.h + + + + + + + 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;portaudio_x86.lib + + + %(AdditionalLibraryDirectories) + LIBC.lib;libcmt.lib + true + false + false + Console + + + + + false + false + + + MachineX86 + Default + + + copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\portaudio\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)" + + + + + + + + + Disabled + Disabled + true + Speed + ../ + Async + MultiThreadedDLL + StreamingSIMDExtensions2 + true + NotUsing + Level4 + ProgramDatabase + true + TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_DEVELOP;%(PreprocessorDefinitions) + false + true + Fast + common/compiler/vs/disable_silly_warnings.h + + + + + + + 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;portaudio_x86.lib + + + %(AdditionalLibraryDirectories) + LIBC.lib;libcmt.lib + true + false + false + Console + + + + + false + false + + + MachineX86 + Default + + + copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies\portaudio\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)"