Bug 673461: Don't automatically disable ANGLE if the DirectX SDK is not found. r=ted

This commit is contained in:
Kyle Huey 2011-07-23 18:42:27 -07:00
Родитель b22f2bf025
Коммит 47c898ca95
1 изменённых файлов: 3 добавлений и 6 удалений

Просмотреть файл

@ -6139,7 +6139,7 @@ if test -n "$MOZ_ANGLE"; then
fi
if test -n "`echo $MOZ_DIRECTX_SDK_REG_KEY | grep 'February 2010'`" ; then
AC_MSG_WARN([Found the February 2010 DirectX SDK. This is too old. We now require the June 2010 DirectX SDK, or newer.])
AC_MSG_ERROR([Found the February 2010 DirectX SDK. This is too old. We now require the June 2010 DirectX SDK, or newer. Upgrade your SDK or to explicitly build without ANGLE, reconfigure with --disable-angle.])
else
MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's/.*\([[a-zA-Z]]\)\\:\\\\/\\1\\:\\\\/'`
fi
@ -6154,8 +6154,7 @@ if test -n "$MOZ_ANGLE"; then
fi
if test -z "$MOZ_ANGLE" ; then
AC_MSG_WARN([Couldn't find the DirectX SDK, needed for ANGLE. Please install it (June 2010 or newer). To explicitly build without ANGLE, reconfigure with --disable-angle.])
AC_MSG_WARN([This will become an error in the future.])
AC_MSG_ERROR([Couldn't find the DirectX SDK, needed for ANGLE. Please install it (June 2010 or newer). To explicitly build without ANGLE, reconfigure with --disable-angle.])
fi
if test -n "$MOZ_ANGLE" ; then
@ -6163,9 +6162,7 @@ if test -n "$MOZ_ANGLE"; then
MOZ_D3DX9_VERSION=`dumpbin //headers "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/d3dx9.lib | egrep d3dx9_[[0-9]][[0-9]]\.dll | head -n1 | sed 's/.*\([[0-9]][[0-9]]\).*/\\1/g'`
if test -z "$MOZ_D3DX9_VERSION" ; then
MOZ_ANGLE=
AC_MSG_WARN([Couldn't determine the D3DX9 version! Disabling ANGLE.])
AC_MSG_WARN([This will become an error in the future.])
AC_MSG_ERROR([Couldn't determine the D3DX9 version, needed for ANGLE. To explicitly build without ANGLE, reconfigure with --disable-angle.])
fi
if test -n "$MOZ_ANGLE" ; then