X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fshell.vcxproj;h=3ca2b782f8169424b4b13c8b8a37bad07ffbac3f;hb=806a51400ac88753b0148af94a6d41e92cba9d95;hp=8d7e433146dc483ff9da9c9eba667c31579a8861;hpb=38292123d99570075c01d9ac865b622a902f6f87;p=casparcg diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj index 8d7e43314..3ca2b782f 100644 --- a/shell/shell.vcxproj +++ b/shell/shell.vcxproj @@ -1,47 +1,89 @@  - + - + Debug - Win32 + x64 + + + Release + x64 + Release Win32 - + + Use + Use + - NotUsing - NotUsing + Use + Use + + + Create + Create + + {8493d01a-f642-454c-8c44-88b38e2a3ef8} + {02308602-7fe0-4253-b96e-22134919f56a} {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} + + + {866a164b-6f7a-450e-8452-c6ae4e176436} + + + {7d58bd57-fdd5-46e6-a23b-ed14b5314a0e} + + + {88f974f0-d09f-4788-8cf8-f563209e60c1} + {2040b361-1fb6-488e-84a5-38a580da90de} - + Designer - - - - - - - + + + + + + + - + {8C26C94F-8092-4769-8D84-DEA479721C5B} @@ -49,47 +91,49 @@ shell - + Application true Unicode + v120 - + Application false true Unicode + v120 - + - + <_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) - C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\..\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) - C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\..\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\ - $(SolutionName) - $(SolutionName) + $(SolutionDir)tmp\$(Configuration)\ + $(SolutionDir)tmp\$(Configuration)\ + ..\dependencies64\RxCpp\include\;..\dependencies64\boost\;..\dependencies64\ffmpeg\include\;..\dependencies64\glew\include;..\dependencies64\sfml\include\;..\dependencies64\tbb\include\;$(IncludePath) + ..\dependencies64\RxCpp\include\;..\dependencies64\boost\;..\dependencies64\ffmpeg\include\;..\dependencies64\glew\include;..\dependencies64\sfml\include\;..\dependencies64\tbb\include\;$(IncludePath) + ..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\freeimage\lib\;..\dependencies64\sfml\extlibs\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\openal\lib\;..\dependencies64\freetype\objs\win32\vc2010;..\dependencies64\asmlib\;..\dependencies64\zlib\lib\;$(LibraryPath) + ..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\freeimage\lib\;..\dependencies64\openal\lib\;..\dependencies64\asmlib\;..\dependencies64\sfml\extlibs\lib;..\dependencies64\freetype\objs\win32\vc2010;..\dependencies64\zlib\lib\;$(LibraryPath) + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ + $(SolutionName) + $(SolutionName) - - false + + true - + false - + @@ -106,35 +150,48 @@ true NotUsing true - Level3 - EditAndContinue - _CRT_SECURE_NO_WARNINGS;TBB_USE_THREADING_TOOLS=1;%(PreprocessorDefinitions) + Level4 + ProgramDatabase + _WIN32_WINNT=0x0601;SFML_STATIC;BOOST_THREAD_VERSION=4;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 - dxguid.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies) + alibcof64.lib;jpeg.lib;sndfile.lib;sfml-system-d-2.lib;sfml-window-d-2.lib;sfml-graphics-d-2.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;tbb.lib;OpenGL32.lib;FreeImaged.lib;glew32.lib;openal32.lib;freetype.lib;zlibstat.lib %(AdditionalLibraryDirectories) - LIBC.LIB;%(IgnoreSpecificDefaultLibraries) + + true $(TargetDir)$(TargetName).pdb - true + false Console false - MachineX86 + false + + - - + copy "$(SolutionDir)dependencies64\ffmpeg\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\tbb\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\glew\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\freeimage\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\openal\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)" +copy "$(SolutionDir)dependencies64\liberation-fonts\LiberationSans-Regular.ttf" "$(OutDir)" +copy "$(SolutionDir)dependencies64\liberation-fonts\LiberationSans-Regular.ttf" "$(ProjectDir)" + - + @@ -144,47 +201,44 @@ AnySuitable true Speed - ../ + ../;%(AdditionalIncludeDirectories) Async MultiThreadedDLL - StreamingSIMDExtensions2 + NotSet true - NotUsing - Level3 + Use + Level4 ProgramDatabase true - NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0601;SFML_STATIC;BOOST_THREAD_VERSION=4;TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;COMPILE_RELEASE;%(PreprocessorDefinitions) false true + true + Fast + common/compiler/vs/disable_silly_warnings.h - - - - - dxguid.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies) - - + false + alibcof64.lib;jpeg.lib;sndfile.lib;sfml-system-2.lib;sfml-window-2.lib;sfml-graphics-2.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;tbb.lib;OpenGL32.lib;glew32.lib;openal32.lib;FreeImage.lib;freetype.lib;zlibstat.lib %(AdditionalLibraryDirectories) - LIBC.lib true - true - true + $(TargetDir)$(TargetName).pdb + false Console - - - - false - false - - - MachineX86 - UseLinkTimeCodeGeneration + false + Default - - + copy "$(SolutionDir)dependencies64\ffmpeg\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\tbb\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\glew\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\freeimage\bin\*.dll" "$(OutDir)" +copy "$(SolutionDir)dependencies64\openal\bin\*.dll" "$(OutDir)" +copy "$(ProjectDir)casparcg.config" "$(OutDir)" +copy "$(ProjectDir)casparcg_auto_restart.bat" "$(OutDir)" +copy "$(SolutionDir)dependencies64\liberation-fonts\LiberationSans-Regular.ttf" "$(OutDir)" +copy "$(SolutionDir)dependencies64\liberation-fonts\LiberationSans-Regular.ttf" "$(ProjectDir)"