X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=core%2Fcore.vcxproj;h=9bd7a8e1c6384447ee7b2f1da58a2eb626b137df;hb=2f7c45b322562aac6436ed2a7fccbe0246190e62;hp=a2716389361d0695f898475b2e56b08ad01c6779;hpb=ce0c7bd96cb0af4a66e5b534236623c71217f9d3;p=casparcg diff --git a/core/core.vcxproj b/core/core.vcxproj index a27163893..9bd7a8e1c 100644 --- a/core/core.vcxproj +++ b/core/core.vcxproj @@ -1,6 +1,10 @@  + + Profile + Win32 + Debug Win32 @@ -26,6 +30,11 @@ Unicode false + + StaticLibrary + Unicode + false + StaticLibrary Unicode @@ -44,6 +53,10 @@ + + + + @@ -55,20 +68,25 @@ <_ProjectFileVersion>10.0.30319.1 - debug\ - release\ - release\ - ..\;..\common;..\..\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) - ..\;..\common;..\..\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) - ..\;..\common;..\..\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) - ..\..\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\ - $(ProjectDir)release\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + ..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath) + ..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath) + ..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath) + ..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath) + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)bin\$(Configuration)\ $(ProjectName) $(ProjectName) + $(ProjectName) $(ProjectName) @@ -88,33 +106,19 @@ true Use 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;%(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) - - - %(AdditionalLibraryDirectories) - LIBC.LIB;%(IgnoreSpecificDefaultLibraries) - true - $(TargetDir)$(TargetName).pdb - true - - - Console - false - - - MachineX86 - + @@ -135,17 +139,53 @@ Level4 ProgramDatabase true - NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + true + true + true + Fast + common/compiler/vs/disable_silly_warnings.h + + + + + + + true + + + + + + + + + MaxSpeed + Disabled + true + Speed + ../;%(AdditionalIncludeDirectories) + Async + MultiThreadedDLL + StreamingSIMDExtensions2 + true + Use + Level4 + ProgramDatabase + true + TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) false 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) + FreeImage.lib;tbb.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -168,6 +208,7 @@ + @@ -176,9 +217,9 @@ Disabled - AnySuitable + Disabled true - Neither + Speed ../;%(AdditionalIncludeDirectories) Async MultiThreadedDLL @@ -188,75 +229,53 @@ Level4 ProgramDatabase true - NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_PERFORMANCE_WARNINGS=1;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) false 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) - - - %(AdditionalLibraryDirectories) - LIBC.lib;%(IgnoreSpecificDefaultLibraries) - true - true - true - Console - - - - - false - false - - - MachineX86 - + - - - - - - - - - + + + + + + + + + - - + + + + + + + + + - - - - - - - - - - + + + + + - - - - + - - - - - + @@ -267,221 +286,164 @@ - - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../../StdAfx.h + ../../../StdAfx.h + ../../../StdAfx.h + ../../../StdAfx.h + + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + + ../StdAfx.h ../StdAfx.h - ../StdAfx.h ../StdAfx.h + ../StdAfx.h - - NotUsing - NotUsing - NotUsing + + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - - ../../../stdafx.h - ../../../stdafx.h - ../../../stdafx.h - - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - - ../../../stdafx.h - ../../../stdafx.h - ../../../stdafx.h - - - ../../stdAfx.h - ../../stdAfx.h - ../../stdAfx.h - - - NotUsing - NotUsing - NotUsing - - - ../../stdAfx.h - ../../stdAfx.h - ../../stdAfx.h - - - ../../stdAfx.h - ../../stdAfx.h - ../../stdAfx.h - - + + ../StdAfx.h ../StdAfx.h + ../StdAfx.h ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h ../StdAfx.h + ../StdAfx.h - + ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h - true - true - true + ../../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h + ../StdAfx.h ../StdAfx.h ../StdAfx.h + ../StdAfx.h ../StdAfx.h false - - ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h - true - true - true - - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h - NotUsing - NotUsing - NotUsing - - - ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - NotUsing - NotUsing - NotUsing - - - true - true - true - NotUsing - NotUsing - NotUsing - - - ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h - NotUsing - NotUsing - NotUsing ../../StdAfx.h ../../StdAfx.h + ../../StdAfx.h ../../StdAfx.h Create Create + Create Create - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - - - + + + StdAfx.h + StdAfx.h + StdAfx.h + StdAfx.h + {02308602-7fe0-4253-b96e-22134919f56a} - - {477e12a4-1b28-4ff7-b46d-76606bdd1891} -