wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 630019 - fix ANGLE build, find any version of DirectX SDK - r=jag, a=blocking2.0

Browse Source
This commit is contained in:
Benoit Jacob 2011-01-31 20:58:02 -05:00
parent cc00ba150e
commit 4d334d070e
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.in
View File

@ -6351,22 +6351,19 @@ if test -n "$MOZ_ANGLE"; then
AC_MSG_ERROR([Building ANGLE requires MSVC. To build without ANGLE, reconfigure with --disable-angle.])
fi
AC_CHECK_HEADER(d3dx9.h, [], [MOZ_ANGLE=])
# remove trailing backslash
MOZ_DIRECTX_SDK_PATH=`echo $DXSDK_DIR|sed 's/\\\\\$//'`
MOZ_ANGLE=
if test -z "$MOZ_ANGLE"; then
# Try again, but try to get the SDK path from the registry. We're going to hardcode
# the February 2010 SDK, since that's the one that's installed on the tinderboxen.
MOZ_DIRECTX_SDK_PATH=`reg query 'HKLM\Software\Microsoft\DirectX\Microsoft DirectX SDK (February 2010)' //v InstallPath | grep REG_SZ | sed 's, *, ,g' | cut -d' ' -f4-`
if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
if test -f "$MOZ_DIRECTX_SDK_PATH"/include/d3dx9.h && test -f "$MOZ_DIRECTX_SDK_PATH"/lib/x86/dxguid.lib ; then
AC_MSG_WARN([Found DirectX SDK in registry, using $MOZ_DIRECTX_SDK_PATH])
MOZ_ANGLE=1
fi
fi
if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
if test -f "$MOZ_DIRECTX_SDK_PATH"/include/d3dx9.h && test -f "$MOZ_DIRECTX_SDK_PATH"/lib/x86/dxguid.lib ; then
AC_MSG_RESULT([Found DirectX SDK via DXSDK_DIR, using $MOZ_DIRECTX_SDK_PATH])
MOZ_ANGLE=1
fi
fi
if test -z "$MOZ_ANGLE"; then
AC_MSG_WARN([Couldn't find d3dx9.h in your INCLUDE path, needed for ANGLE. Please install the February 2010 DirectX SDK, or make another version available in your LIB and INCLUDE path env variables. To explicitly build without ANGLE, reconfigure with --disable-angle.])
if test -z "$MOZ_ANGLE" ; then
AC_MSG_WARN([Couldn't find the DirectX SDK, needed for ANGLE. Please install it (February 2010 or newer). To explicitly build without ANGLE, reconfigure with --disable-angle.])
AC_MSG_WARN([This will become an error in the future.])
fi
fi

4
gfx/angle/Makefile.in
View File

@ -148,8 +148,8 @@ ANGLE_DIR = Release
endif
ifdef MOZ_DIRECTX_SDK_PATH
INCLUDE := $(INCLUDE);$(MOZ_DIRECTX_SDK_PATH)\include
LIB := $(LIB);$(MOZ_DIRECTX_SDK_PATH)\lib\x86
export INCLUDE := $(INCLUDE);$(MOZ_DIRECTX_SDK_PATH)\include
export LIB := $(LIB);$(MOZ_DIRECTX_SDK_PATH)\lib\x86
endif
ANGLE_DEP_PATTERNS = \