Kaydet (Commit) ee1cd2d9 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

windows fix. some path need to be 'formatted' appropriately

üst 52a506fd
...@@ -7713,7 +7713,6 @@ the Windows SDK are installed.]) ...@@ -7713,7 +7713,6 @@ the Windows SDK are installed.])
-o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then
AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.]) AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
fi fi
SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/include"
fi fi
if test -z "$WINDOWS_SDK_HOME"; then if test -z "$WINDOWS_SDK_HOME"; then
...@@ -7727,6 +7726,9 @@ the Windows SDK are installed.]) ...@@ -7727,6 +7726,9 @@ the Windows SDK are installed.])
else else
AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
fi fi
PathFormat "$WINDOWS_SDK_HOME"
WINDOWS_SDK_HOME="$formatted_path"
SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/include"
fi fi
AC_SUBST(WINDOWS_SDK_HOME) AC_SUBST(WINDOWS_SDK_HOME)
...@@ -7752,7 +7754,6 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then ...@@ -7752,7 +7754,6 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
elif test -n "$with_directx_home"; then elif test -n "$with_directx_home"; then
DIRECTXSDK_HOME="$with_directx_home" DIRECTXSDK_HOME="$with_directx_home"
fi fi
SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
HAVE_DIRECTXSDK_H="yes" HAVE_DIRECTXSDK_H="yes"
...@@ -7780,6 +7781,9 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then ...@@ -7780,6 +7781,9 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
else else
AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway]) AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
fi fi
PathFormat "$DIRECTXSDK_HOME"
DIRECTXSDK_HOME="$formatted_path"
SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
fi fi
AC_SUBST(DIRECTXSDK_HOME) AC_SUBST(DIRECTXSDK_HOME)
AC_SUBST(DIRECTXSDK_LIB) AC_SUBST(DIRECTXSDK_LIB)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment