Title: [153874] trunk/Source/ThirdParty/ANGLE
- Revision
- 153874
- Author
- achristen...@apple.com
- Date
- 2013-08-08 19:12:02 -0700 (Thu, 08 Aug 2013)
Log Message
Link to correct DirectX libraries for Win64 ANGLE build.
https://bugs.webkit.org/show_bug.cgi?id=119600
Reviewed by Brent Fulgham.
* ANGLE.vcxproj/DirectX32.props: Added with x86 DirectX library directory.
* ANGLE.vcxproj/DirectX64.props: Added with x64 DirectX library directory.
* ANGLE.vcxproj/libEGL.vcxproj:
* ANGLE.vcxproj/libGLESv2.vcxproj:
Use DirectX32.props and DirectX64.props.
* ANGLE.vcxproj/libEGLCommon.props:
* ANGLE.vcxproj/libGLESv2Common.props:
Removed DirectX library directory.
Modified Paths
Added Paths
Diff
Added: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props (0 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props 2013-08-09 02:12:02 UTC (rev 153874)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <Link>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
\ No newline at end of file
Added: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props (0 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props 2013-08-09 02:12:02 UTC (rev 153874)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <Link>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
\ No newline at end of file
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (153873 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-08-09 00:49:25 UTC (rev 153873)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-08-09 02:12:02 UTC (rev 153874)
@@ -92,50 +92,60 @@
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libEGLCommon.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props (153873 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2013-08-09 00:49:25 UTC (rev 153873)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2013-08-09 02:12:02 UTC (rev 153874)
@@ -10,7 +10,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName)\;$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (153873 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-08-09 00:49:25 UTC (rev 153873)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-08-09 02:12:02 UTC (rev 153874)
@@ -88,50 +88,60 @@
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX32.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
<Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
<Import Project="libGLESv2Common.props" />
<Import Project="ANGLERelease.props" />
+ <Import Project="DirectX64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (153873 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2013-08-09 00:49:25 UTC (rev 153873)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2013-08-09 02:12:02 UTC (rev 153874)
@@ -10,7 +10,7 @@
<Link>
<ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
<AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName)\;$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (153873 => 153874)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-09 00:49:25 UTC (rev 153873)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-08-09 02:12:02 UTC (rev 153874)
@@ -1,3 +1,19 @@
+2013-08-08 Alex Christensen <achristen...@apple.com>
+
+ Link to correct DirectX libraries for Win64 ANGLE build.
+ https://bugs.webkit.org/show_bug.cgi?id=119600
+
+ Reviewed by Brent Fulgham.
+
+ * ANGLE.vcxproj/DirectX32.props: Added with x86 DirectX library directory.
+ * ANGLE.vcxproj/DirectX64.props: Added with x64 DirectX library directory.
+ * ANGLE.vcxproj/libEGL.vcxproj:
+ * ANGLE.vcxproj/libGLESv2.vcxproj:
+ Use DirectX32.props and DirectX64.props.
+ * ANGLE.vcxproj/libEGLCommon.props:
+ * ANGLE.vcxproj/libGLESv2Common.props:
+ Removed DirectX library directory.
+
2013-07-23 David Farler <dfar...@apple.com>
Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
