Manually merged 77fbc02 from master

[casparcg] / shell / shell.vcxproj

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 35590864e84d4a5fff218b3b9ed8c38329369c0b..44be3361b724d455ad6066eddce38b0ab401b28a 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -12,15 +12,22 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="server.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="main.cpp">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="stdafx.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ProjectReference Include="..\accelerator\accelerator.vcxproj">\r
+      <Project>{8493d01a-f642-454c-8c44-88b38e2a3ef8}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\common\common.vcxproj">\r
       <Project>{02308602-7fe0-4253-b96e-22134919f56a}</Project>\r
     </ProjectReference>\r
@@ -45,7 +52,13 @@
     <ProjectReference Include="..\modules\oal\oal.vcxproj">\r
       <Project>{82ed7ed6-8a15-40ec-a8af-f5e712e0da68}</Project>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\modules\ogl\ogl.vcxproj">\r
+    <ProjectReference Include="..\modules\psd\psd.vcxproj">\r
+      <Project>{866a164b-6f7a-450e-8452-c6ae4e176436}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\modules\reroute\reroute.vcxproj">\r
+      <Project>{7d58bd57-fdd5-46e6-a23b-ed14b5314a0e}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\modules\screen\screen.vcxproj">\r
       <Project>{88f974f0-d09f-4788-8cf8-f563209e60c1}</Project>\r
     </ProjectReference>\r
     <ProjectReference Include="..\protocol\protocol.vcxproj">\r
@@ -61,6 +74,7 @@
   <ItemGroup>\r
     <ClInclude Include="server.h" />\r
     <ClInclude Include="resource.h" />\r
+    <ClInclude Include="stdafx.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="shell.rc" />\r
@@ -98,8 +112,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)tmp\$(Configuration)\</IntDir>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\dependencies64\boost\;..\dependencies64\ffmpeg\include\;..\dependencies64\glew\include;..\dependencies64\sfml\include\;..\dependencies64\tbb\include\;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\dependencies64\boost\;..\dependencies64\ffmpeg\include\;..\dependencies64\glew\include;..\dependencies64\sfml\include\;..\dependencies64\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\freeimage\lib\;..\dependencies64\sfml\extlibs\lib\;..\dependencies64\asmlib\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\freeimage\lib\;..\dependencies64\sfml\extlibs\lib\;..\dependencies64\asmlib\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\sfml\extlibs\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\freeimage\lib\;..\dependencies64\openal\lib\;..\dependencies64\asmlib\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\dependencies64\boost\stage\lib;..\dependencies64\ffmpeg\lib\;..\dependencies64\glew\lib;..\dependencies64\sfml\lib\;..\dependencies64\tbb\lib\;..\dependencies64\freeimage\lib\;..\dependencies64\openal\lib\;..\dependencies64\asmlib\;..\dependencies64\freetype\objs\win32\vc2010;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\$(Configuration)\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\$(Configuration)\</OutDir>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionName)</TargetName>\r
@@ -137,7 +151,7 @@
       <ForcedIncludeFiles>common/compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>alibcof64.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;sfml-audio-d.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;OpenGL32.lib;FreeImaged.lib;glew32.lib;freetype248_D.lib;openal32.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>alibcof64.lib;freetype248_d.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;sfml-audio-d.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;tbb.lib;OpenGL32.lib;FreeImaged.lib;glew32.lib;openal32.lib</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -161,6 +175,7 @@
 copy "$(SolutionDir)dependencies64\tbb\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies64\glew\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies64\freeimage\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies64\openal\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
@@ -184,7 +199,7 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
       <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;NDEBUG;COMPILE_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WholeProgramOptimization>true</WholeProgramOptimization>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <FloatingPointModel>Fast</FloatingPointModel>\r
@@ -192,7 +207,7 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
     </ClCompile>\r
     <Link>\r
       <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalDependencies>alibcof64.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;tbb.lib;OpenGL32.lib;glew32.lib;freetype248.lib;openal32.lib;freeimage.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>alibcof64.lib;freetype250.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;Winmm.lib;Ws2_32.lib;avformat.lib;avcodec.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;tbb.lib;OpenGL32.lib;glew32.lib;openal32.lib;freeimage.lib</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
@@ -200,12 +215,14 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
       <SubSystem>Console</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <MapExports>false</MapExports>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>copy "$(SolutionDir)dependencies64\ffmpeg\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies64\tbb\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies64\glew\bin\*.dll" "$(OutDir)"\r
 copy "$(SolutionDir)dependencies64\freeimage\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies64\openal\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r