Bug 630019 - the DXSDK way didn't work on build slaves! reverting to the way using the registry that was earlier reviewed by jag on bug 630019. r=jag, a=blocking2.0

This commit is contained in:
Benoit Jacob 2011-01-31 23:29:46 -05:00
Родитель 30df527792
Коммит c304b8c770
1 изменённых файлов: 4 добавлений и 2 удалений

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

@ -6351,8 +6351,10 @@ if test -n "$MOZ_ANGLE"; then
AC_MSG_ERROR([Building ANGLE requires MSVC. To build without ANGLE, reconfigure with --disable-angle.])
fi
# remove trailing backslash
MOZ_DIRECTX_SDK_PATH=`echo $DXSDK_DIR|sed 's/\\\\\$//'`
# Get the SDK path from the registry.
MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1`
MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's, *, ,g' | cut -d' ' -f4-`
MOZ_ANGLE=
if test -n "$MOZ_DIRECTX_SDK_PATH" ; then