diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 13:45:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 14:58:27 +0200 |
| commit | 903346aa8d8f278cc1a408bc4bc3e723f3f357a2 (patch) | |
| tree | 89c1e0336abd2e7c0f4f92fa16883667f932a0db /configure.ac | |
| parent | 6bdc5883b2f277ec36ffc1855b132aeab7e3e80b (diff) | |
More x64 MSVC fixes
Change-Id: If3a81a27b008d396d5cee05337feb2cc58e498d6
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e9c035bee153..5114c39e14c0 100644 --- a/configure.ac +++ b/configure.ac @@ -5261,7 +5261,7 @@ if test "$_os" = "Linux"; then esac elif test "$_os" = "SunOS" -a "$COM" = "C52"; then BUILD_STLPORT="yes" -elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then +elif test "$_os" = "WINNT" -a "$CPUNAME" != X86_64 -a "$WITH_MINGW" != "yes"; then BUILD_STLPORT="yes" elif test "$_os" = "FreeBSD"; then BUILD_STLPORT="yes" @@ -9172,11 +9172,10 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then HAVE_DIRECTXSDK_H="no" fi - # MS changed the location of the libraries with Dec 2004 DirectX SDK - if test -d "$DIRECTXSDK_HOME/lib/x86"; then - DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86" + if test "$BITNESS_OVERRIDE" = 64; then + DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x64" else - DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib" + DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86" fi PathFormat "$DIRECTXSDK_LIB" DIRECTXSDK_LIB="$formatted_path" @@ -12608,7 +12607,7 @@ if test "$build_os" = "cygwin"; then fi if test "$BITNESS_OVERRIDE" = 64; then ILIB="$ILIB;$COMPATH/lib/amd64" - ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64" + ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/x64" if test "$WINDOWS_SDK_VERSION" = "80"; then ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64" fi |