Various Build Fixes

Fix for WiX library and merge module. Also fix for debug builds and ConcreteMiddleWare.cpp

Author: markgalvan-intel

IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj

@@ -6,7 +6,7 @@
     <IntermediateOutputPath>obj\</IntermediateOutputPath>
     <OutputPath>bin\</OutputPath>
     <!-- Point these at YOUR WiX 3.x install -->
-    <WixToolPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\</WixToolPath>
+    <WixToolPath>$(WIX)bin\</WixToolPath>
     <WixTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <!-- Define the two variables your .wxs uses -->
     <DefineConstants>

IntelPresentMon/PresentMonMiddleware/PresentMonMiddleware.vcxproj

@@ -21,7 +21,9 @@
     <ClInclude Include="MockCommon.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ConcreteMiddleware.cpp" />
+    <ClCompile Include="ConcreteMiddleware.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <ClCompile Include="FrameEventQuery.cpp" />
     <ClCompile Include="LogSetup.cpp" />
   </ItemGroup>

IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj

@@ -6,7 +6,7 @@
     <IntermediateOutputPath>obj\</IntermediateOutputPath>
     <OutputPath>$(SolutionDir)build\$(Configuration)\en-us\</OutputPath>
     <!-- Point to your WiX 3.11 install -->
-    <WixToolPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\</WixToolPath>
+    <WixToolPath>$(WIX)bin\</WixToolPath>
     <WixTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <!-- If your wixlib expects a specific DirectoryRef Id -->
     <DefineConstants>PM.ServiceDirId=service_folder</DefineConstants>