X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fcore.vcxproj;h=6dafa35cfdb0b008b98b90e46420f3f7347b4c8e;hb=4abe37aece37ac56037f2c00cb3c4f1e2c2a9cee;hp=9013bb0f19896f19fd8cae692b3dcc72fed514f7;hpb=dc68ca2393637806ca4898103684a31a83dd525c;p=casparcg diff --git a/core/core.vcxproj b/core/core.vcxproj index 9013bb0f1..6dafa35cf 100644 --- a/core/core.vcxproj +++ b/core/core.vcxproj @@ -1,8 +1,8 @@  - - Amplify + + Profile Win32 @@ -30,7 +30,7 @@ Unicode false - + StaticLibrary Unicode false @@ -53,7 +53,7 @@ - + @@ -68,25 +68,25 @@ <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - ..\;..\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) - ..\;..\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) - ..\..\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)release\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + ..\;..\dependencies\boost\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\;..\dependencies\boost\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;..\dependencies\FreeImage\Dist;$(IncludePath) + ..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\dependencies\boost\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_10_0_42\Lib\;..\dependencies\boost\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_10_0_42\Lib\;..\dependencies\boost\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_10_0_42\Lib\;..\dependencies\boost\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) $(ProjectName) @@ -106,34 +106,19 @@ true Use true - Level3 + Level4 EditAndContinue - TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(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 - + @@ -159,37 +144,17 @@ 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 - + + true + - + @@ -213,13 +178,14 @@ 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) @@ -242,6 +208,7 @@ + @@ -250,7 +217,7 @@ Disabled - AnySuitable + Disabled true Speed ../;%(AdditionalIncludeDirectories) @@ -267,71 +234,57 @@ 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 - + - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - - - - + + + + + - - - - + - - - - - + @@ -342,270 +295,211 @@ - - + + ../../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 - 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 + + + + ../../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 - 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 - true - true - true - true + ../../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 - ../../StdAfx.h + ../../StdAfx.h ../../StdAfx.h - true - true - true - true - + + ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h - NotUsing - NotUsing - NotUsing - NotUsing - true - true - true - true - - - ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h - NotUsing - NotUsing - NotUsing - NotUsing - - - true - true - true - true - NotUsing - 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 + false + + + ../../StdAfx.h + ../../StdAfx.h ../../StdAfx.h - NotUsing - NotUsing - NotUsing - NotUsing - true - true - true - true + ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h + ../../StdAfx.h ../../StdAfx.h Create Create - Create + Create Create - - - - - true - true - true - true - - - true - true - 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} -