X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fshell.vcxproj;h=21d8c075f340792ea1864d170b641ba96a80b746;hb=a4d30b31c18bb8cbb1a66e92fd837517a4068a8d;hp=fb194c6a2d4aded91cc8152d865f19ae6a7e103f;hpb=ceb9adee0ab86fbc991c3f4a8f0ce1b0fa0a6c16;p=casparcg
diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index fb194c6a2..21d8c075f 100644
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -25,6 +25,7 @@
NotUsing
NotUsing
NotUsing
+ false
@@ -55,15 +56,12 @@
{88f974f0-d09f-4788-8cf8-f563209e60c1}
-
- {b964d953-8882-454c-a935-db711d697e39}
-
{2040b361-1fb6-488e-84a5-38a580da90de}
-
+
Designer
@@ -126,14 +124,14 @@
$(SolutionDir)tmp\$(Configuration)\
$(SolutionDir)tmp\$(Configuration)\
$(SolutionDir)tmp\$(Configuration)\
- ..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\dependencies\boost_1_44_0\;..\dependencies\ffmpeg 0.6\include\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\include\;..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\dependencies\boost_1_44_0\;..\dependencies\ffmpeg 0.6\include\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\include\;..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\dependencies\boost_1_44_0\;..\dependencies\ffmpeg 0.6\include\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\include\;..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\dependencies\boost_1_44_0\;..\dependencies\ffmpeg 0.6\include\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\include\;..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- C:\Program\Microsoft DirectX SDK (June 2010)\Lib\x86;..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
+ ..\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;$(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;$(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;$(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;$(LibraryPath)
$(SolutionDir)bin\$(Configuration)\
$(SolutionDir)bin\$(Configuration)\
$(SolutionDir)bin\$(Configuration)\
@@ -174,14 +172,14 @@
true
Level4
EditAndContinue
- TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(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
- Bluevelvet3_d.lib;BlueHancUtils_d.lib;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-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib
+ 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;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib
%(AdditionalLibraryDirectories)
@@ -200,8 +198,14 @@
false
- copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"
+ 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\lib\*.dll" "$(OutDir)"
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"
@@ -223,7 +227,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
Level4
ProgramDatabase
true
- TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
+ TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_RELEASE;%(PreprocessorDefinitions)
true
true
Fast
@@ -234,14 +238,14 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
- Bluevelvet3.lib;BlueHancUtils.lib;sfml-system.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
+ 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;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib
%(AdditionalLibraryDirectories)
LIBC.lib
true
- false
- false
+ true
+ true
Console
@@ -253,10 +257,17 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
MachineX86
UseLinkTimeCodeGeneration
+ true
- copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"
+ 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\lib\*.dll" "$(OutDir)"
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"
@@ -278,7 +289,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
Level4
ProgramDatabase
true
- TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
+ TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_PROFILE;%(PreprocessorDefinitions)
false
true
Fast
@@ -289,7 +300,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
- Bluevelvet3.lib;BlueHancUtils.lib;sfml-system.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
+ 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;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib
%(AdditionalLibraryDirectories)
@@ -310,8 +321,14 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
Default
- copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"
+ 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\lib\*.dll" "$(OutDir)"
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"
@@ -333,7 +350,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
Level4
ProgramDatabase
true
- TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
+ TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;NDEBUG;_VC80_UPGRADE=0x0710;COMPILE_DEVELOP;%(PreprocessorDefinitions)
false
true
Fast
@@ -344,7 +361,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
- Bluevelvet3.lib;BlueHancUtils.lib;sfml-system.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
+ 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;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;glew32.lib;zdll.lib
%(AdditionalLibraryDirectories)
@@ -365,8 +382,14 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"
Default
- copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"
+ 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\lib\*.dll" "$(OutDir)"
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"