2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / protocol / protocol.vcxproj

diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj
index 398019f99f1f48bc63830004a8e25af0fc5384c9..4ce363226274de8308e4eaf968070364f957e204 100644 (file)
--- a/protocol/protocol.vcxproj
+++ b/protocol/protocol.vcxproj
@@ -25,9 +25,6 @@
     <ProjectReference Include="..\core\core.vcxproj">\r
       <Project>{79388c20-6499-4bf6-b8b9-d8c33d7d4ddd}</Project>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\mixer\mixer.vcxproj">\r
-      <Project>{477e12a4-1b28-4ff7-b46d-76606bdd1891}</Project>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\modules\flash\flash.vcxproj">\r
       <Project>{816deaba-3757-4306-afe0-c27cf96c4dea}</Project>\r
     </ProjectReference>\r
@@ -162,34 +159,38 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <IncludePath>../;..\dependencies/tbb30_20100406oss/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>\r
+    <IncludePath>../;..\dependencies/tbb/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
+    <OutDir>$(ProjectDir)bin\$(Configuration)\</OutDir>\r
+    <IntDir>$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <IncludePath>../;..\dependencies/tbb30_20100406oss/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>\r
-    <IntDir>$(ProjectDir)\bin\$(Configuration)\</IntDir>\r
+    <IncludePath>../;..\dependencies/tbb/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
+    <OutDir>$(ProjectDir)bin\$(Configuration)\</OutDir>\r
+    <IntDir>$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
-    <IncludePath>../;..\dependencies/tbb30_20100406oss/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>\r
+    <IncludePath>../;..\dependencies/tbb/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
+    <OutDir>$(ProjectDir)bin\$(Configuration)\</OutDir>\r
+    <IntDir>$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
-    <IncludePath>../;..\dependencies/tbb30_20100406oss/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
-    <OutDir>$(ProjectDir)\bin\$(Configuration)\</OutDir>\r
+    <IncludePath>../;..\dependencies/tbb/include;..\dependencies\boost_1_44_0;$(IncludePath)</IncludePath>\r
+    <OutDir>$(ProjectDir)bin\$(Configuration)\</OutDir>\r
+    <IntDir>$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
-      <WarningLevel>Level1</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;TBB_USE_DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <MinimalRebuild>false</MinimalRebuild>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -199,7 +200,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level1</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -213,6 +214,7 @@
       <MinimalRebuild>false</MinimalRebuild>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -226,7 +228,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level1</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -240,6 +242,7 @@
       <MinimalRebuild>false</MinimalRebuild>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -251,7 +254,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
     <ClCompile>\r
-      <WarningLevel>Level1</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <Optimization>Disabled</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -265,6 +268,8 @@
       <MinimalRebuild>false</MinimalRebuild>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r