X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fcore.vcxproj;h=cec7204420b300c6c7d16d9bdf69a1eabf459f23;hb=3e24d74aeda6d6ab7a272866bba9df94ad604cb2;hp=1756bd4f897713dec937af79da6d87c6a4846943;hpb=908094a77f49d0dd769cd760a04bbee9d3ff9958;p=casparcg diff --git a/core/core.vcxproj b/core/core.vcxproj index 1756bd4f8..cec720442 100644 --- a/core/core.vcxproj +++ b/core/core.vcxproj @@ -1,21 +1,13 @@  - - Profile - Win32 - - + Debug - Win32 - - - Develop - Win32 + x64 - + Release - Win32 + x64 @@ -25,71 +17,41 @@ core - - StaticLibrary - Unicode - false - - + StaticLibrary Unicode - false + true - + StaticLibrary + false Unicode - false - - - StaticLibrary - Unicode - true - false + true - - - - - + - - - - - + <_ProjectFileVersion>10.0.30319.1 - $(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) + $(ProjectDir)tmp\$(Configuration)\ + $(ProjectDir)tmp\$(Configuration)\ + ..\;..\dependencies64\boost\;..\dependencies64\tbb\include\;..\dependencies64\sfml\include\;..\dependencies64\glew\include\;..\dependencies64\asmlib\;$(IncludePath) + ..\;..\dependencies64\boost\;..\dependencies64\tbb\include\;..\dependencies64\sfml\include\;..\dependencies64\glew\include\;..\dependencies64\asmlib\;$(IncludePath) + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)bin\$(Configuration)\ + $(ProjectName) + $(ProjectName) - + @@ -107,7 +69,7 @@ Use true Level4 - EditAndContinue + ProgramDatabase TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_DEBUG;_DEBUG;%(PreprocessorDefinitions) true true @@ -120,7 +82,7 @@ - + @@ -139,7 +101,7 @@ Level4 ProgramDatabase true - TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;%(PreprocessorDefinitions) true true true @@ -154,124 +116,23 @@ 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 - - - - - - - FreeImage.lib;tbb.lib;%(AdditionalDependencies) - - - %(AdditionalLibraryDirectories) - LIBC.lib;%(IgnoreSpecificDefaultLibraries) - true - true - true - Console - - - - - false - false - - - MachineX86 - - - - - - - - - - - - - - Disabled - Disabled - true - Speed - ../;%(AdditionalIncludeDirectories) - Async - MultiThreadedDLL - StreamingSIMDExtensions2 - true - Use - Level4 - ProgramDatabase - true - 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 - - - - - - - - - - - + + + + + + - - - - - + - - - - - - - - - - - @@ -286,163 +147,74 @@ - - ../../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 - ../../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 - false + ../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 - Create - Create - Create - Create + Create + Create - StdAfx.h - StdAfx.h - StdAfx.h - StdAfx.h + StdAfx.h + StdAfx.h