[Win] Unreviewed build fix for some DirectX SDK Installs
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Mar 2015 23:47:00 +0000 (23:47 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Mar 2015 23:47:00 +0000 (23:47 +0000)
* ANGLE.vcxproj/libGLESv2Common.props: Correct path for Lib and
Include paths based on problems others have had building WebKit
under different Windows and DirectX revisions.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
Source/ThirdParty/ANGLE/ChangeLog

index 1762cdc..9938172 100755 (executable)
@@ -4,13 +4,13 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(DXSDK_DIR)Include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(DXSDK_DIR)\Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ANGLE_DEFAULT_D3D11=1;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NOMINMAX;ANGLE_WEBKIT_WIN;ANGLE_SKIP_DXGI_1_2_CHECK=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
       <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib$(PlatformTarget);$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <ResourceCompile>
@@ -18,4 +18,4 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
index 317ed42..6ac327e 100644 (file)
@@ -1,3 +1,11 @@
+2015-03-12  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Unreviewed build fix for some DirectX SDK Installs
+
+        * ANGLE.vcxproj/libGLESv2Common.props: Correct path for Lib and
+        Include paths based on problems others have had building WebKit
+        under different Windows and DirectX revisions.
+
 2015-02-20  Alexey Proskuryakov  <ap@apple.com>
 
         Remove svn:keywords property.