Title: [181459] trunk/Source/ThirdParty/ANGLE
- Revision
- 181459
- Author
- [email protected]
- Date
- 2015-03-12 16:47:00 -0700 (Thu, 12 Mar 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (181458 => 181459)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2015-03-12 22:57:13 UTC (rev 181458)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2015-03-12 23:47:00 UTC (rev 181459)
@@ -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
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (181458 => 181459)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-12 22:57:13 UTC (rev 181458)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-03-12 23:47:00 UTC (rev 181459)
@@ -1,3 +1,11 @@
+2015-03-12 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
Remove svn:keywords property.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
