git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb717e0)
Link to correct DirectX libraries for Win64 ANGLE build.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Aug 2013 02:12:02 +0000 (02:12 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Aug 2013 02:12:02 +0000 (02:12 +0000)
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.

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

Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props [new file with mode: 0644] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props [new file with mode: 0644] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props patch | blob | history
Source/ThirdParty/ANGLE/ChangeLog patch | blob | history

diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props
new file mode 100644 (file)
index 0000000..1cfe7f5
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup />\r
+  <ItemDefinitionGroup>\r
+    <Link>\r
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props
new file mode 100644 (file)
index 0000000..99a9d09
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup />\r
+  <ItemDefinitionGroup>\r
+    <Link>\r
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
index d9f610980039f76ba54bb9261bd6f0fbae8a7613..4790b3c66e8761946a5e49401127e04d0c3f97a8 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
@@ -92,50 +92,60 @@
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libEGLCommon.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <ItemGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props
index a842a84e994ab682bcebb15b63353b3378e8e984..4a67b539be3e56700eed5c73c39d038864cb6c22 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props
@@ -10,7 +10,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName)\;$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>\r
     </Link>\r
   </ItemDefinitionGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
index d2fe23181b73ab73a60666640e721f9363eb7689..b08b5de56320bcd51b5bf12f55de9567efd0ea04 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
@@ -88,50 +88,60 @@
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX32.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
     <Import Project="libGLESv2Common.props" />\r
     <Import Project="ANGLERelease.props" />\r
+    <Import Project="DirectX64.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <ItemGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
index 07fbcc0298faa823abbbbb2472884364eed67601..923bc4376a9655ca97c909bb07d8370e57672a35 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
@@ -10,7 +10,7 @@
     <Link>\r
       <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>\r
       <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName)\;$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup />\r
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 30c9b3df3c14090e07facfbd53bd7b448b2e5d9a..d2882c8d197a68ca4e9016be6cd89edd9ebee985 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,19 @@
+2013-08-08  Alex Christensen  <achristensen@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  <dfarler@apple.com>
 
         Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
Mirror of the WebKit open source project from svn.webkit.org.