diff options
| author | Anthony Green <green@moxielogic.com> | 2017-03-17 09:20:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 09:20:40 -0400 |
| commit | a0b14eea2baf9f18c0d29bc5ce4495422381f917 (patch) | |
| tree | 6bd6860493fa9e10dd0e304d4203a82f3a65b812 /configure.host | |
| parent | fa5a0fe2c6da906cc7c114c8002e5c7092c4dbee (diff) | |
| parent | 1e0d107b4b237edd11ca3209a9cf59786f752fe5 (diff) | |
| download | libffi-a0b14eea2baf9f18c0d29bc5ce4495422381f917.tar.gz | |
Merge pull request #291 from ramon-garcia/visual-studio-build
Build with Visual C++ (64 bits)
Diffstat (limited to 'configure.host')
| -rw-r--r-- | configure.host | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.host b/configure.host index e366c74..36ffbb8 100644 --- a/configure.host +++ b/configure.host @@ -65,13 +65,16 @@ case "${host}" in ;; i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2* | i?86-*-interix* \ - | x86_64-*-cygwin* | x86_64-*-mingw*) + | x86_64-*-cygwin* | x86_64-*-mingw* | x86_64-*-winnt* ) TARGETDIR=x86 if test $ac_cv_sizeof_size_t = 4; then TARGET=X86_WIN32 else TARGET=X86_WIN64 fi + if test "${ax_cv_c_compiler_vendor}" = "microsoft"; then + MSVC=1 + fi # All mingw/cygwin/win32 builds require -no-undefined for sharedlib. # We must also check with_cross_host to decide if this is a native # or cross-build and select where to install dlls appropriately. @@ -249,7 +252,11 @@ case "${TARGET}" in SOURCES="ffi64.c unix64.S ffiw64.c win64.S" ;; X86_WIN64) - SOURCES="ffiw64.c win64.S" + if test "$MSVC" = 1; then + SOURCES="ffiw64.c win64_intel.S" + else + SOURCES="ffiw64.c win64.S" + fi ;; esac |