Successful build with the new CCast library.

Some changes were added to the files to facilitate a successful build. Signed-off-by: Arthur Liberman <[email protected]>
arthur-liberman · Feb 24, 2017 · b956d4e · b956d4e
1 parent 443e5db
commit b956d4e
Show file tree

Hide file tree

Showing 13 changed files with 521 additions and 426 deletions.
diff --git a/ColorHCFR.vcxproj b/ColorHCFR.vcxproj
@@ -993,11 +993,6 @@
     </ProjectReference>
     <ProjectReference Include="libccast\libccast.vcxproj">
       <Project>{157843c3-1412-43dd-8832-19eac7df2b3f}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
     <ProjectReference Include="libharu\libharu.vcxproj">
       <Project>{416e77ff-acfa-478d-9e8b-fa1e1296e007}</Project>
@@ -1017,6 +1012,10 @@
     <ProjectReference Include="Tools\ArgyllMeterWrapper\ArgyllMeterWrapper.vcxproj">
       <Project>{1a665dc9-9c8b-428a-ac8c-5e9dbc3529aa}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
     <ProjectReference Include="Tools\CxImage\cximage.vcxproj">
       <Project>{906a0b24-c4b5-4824-a027-ce75bf66242d}</Project>

diff --git a/Tools/GoogleCastWrapper/GoogleCastWrapper.cpp b/Tools/GoogleCastWrapper/GoogleCastWrapper.cpp
@@ -1,5 +1,5 @@
 #include "GoogleCastWrapper.h"
-#include <string.h>
+#include <string>
 #include <stdio.h>
 #include <stdlib.h>
 #include <Windows.h> // For OutputDebugString.

diff --git a/Tools/GoogleCastWrapper/GoogleCastWrapper.vcxproj b/Tools/GoogleCastWrapper/GoogleCastWrapper.vcxproj
@@ -60,7 +60,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -85,11 +84,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\libccast\libccast.vcxproj">
       <Project>{157843c3-1412-43dd-8832-19eac7df2b3f}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />