Changeset 181459 in webkit

Timestamp:

Mar 12, 2015, 4:47:00 PM (11 years ago)

Author:

Brent Fulgham

Message:

[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.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ANGLE.vcxproj/libGLESv2Common.props (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -5 +5 @@
   <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>
@@ -11 +11 @@
       <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>

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+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>