--- /dev/null
+<?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
--- /dev/null
+<?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
<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
</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
<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
<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
+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