diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 21:09:48 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 21:09:48 (GMT) |
| commit | ebb68ac10e6b5f02ffb582f680cac4596181321b (patch) | |
| tree | a19a9ed4fd888420916b1f21257c2c5b4b692bdc /win | |
| parent | adeca10c9becffef5abd33c10f130caa1cefeabb (diff) | |
| download | blt-ebb68ac10e6b5f02ffb582f680cac4596181321b.zip blt-ebb68ac10e6b5f02ffb582f680cac4596181321b.tar.gz blt-ebb68ac10e6b5f02ffb582f680cac4596181321b.tar.bz2 | |
add support for win32
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rwxr-xr-x | win/configure | 12 | ||||
| -rwxr-xr-x | win/configure.ac | 10 |
3 files changed, 7 insertions, 21 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index d953bcc..f1d5f62 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -14,11 +14,11 @@ ARCH = @ARCH@ EXEEXT = @EXEEXT@ JOBS = @CORES@ -CONFIGFLAGS = @CONFIGFLAGS@ -CROSSCOMPILE = @CROSSCOMPILE@ ENABLE64BIT = @ENABLE64BIT@ TARGET = @TARGET@ +CONFIGFLAGS =CC=$(TARGET)-gcc AR=$(TARGET)-ar + ASTFLAGS = CFLAGS=-DCMINPACK_NO_DLL XPAFLAGS = CFLAGS=-DSTATIC_BUILD TCLXMLFLAGS = --with-xml-static=yes @@ -130,7 +130,7 @@ openssl/Makefile: @echo "" @echo "*** $@ ***" cd openssl; \ - export CROSS_COMPILE=$(CROSSCOMPILE); \ + export CROSS_COMPILE=$(TARGET)-; \ ./Configure mingw64 --prefix=$(prefix) shared no-asm #--------------------------clean diff --git a/win/configure b/win/configure index 199fac1..094d4fd 100755 --- a/win/configure +++ b/win/configure @@ -586,8 +586,6 @@ LIBOBJS CORES TARGET ENABLE64BIT -CROSSCOMPILE -CONFIGFLAGS ARCH OS PKG_CFLAGS @@ -1864,23 +1862,17 @@ ARCH=$with_arch case $with_arch in win32 | WIN32 ) - CONFIGFLAGS='CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar' - CROSSCOMPILE=i686-w64-mingw32- ENABLE64BIT= - TARGET=i686-unknown-mingw32 + TARGET=i686-w64-mingw32 ;; win64 | WIN64 | *) - CONFIGFLAGS='CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar' - CROSSCOMPILE=x86_64-w64-mingw32- ENABLE64BIT=--enable-64bit - TARGET=x86_64-unknown-mingw32 + TARGET=x86_64-w64-mingw32 ;; esac - - prefix=$ac_pwd exec_prefix=$ac_pwd diff --git a/win/configure.ac b/win/configure.ac index fe2486f..20a5a3a 100755 --- a/win/configure.ac +++ b/win/configure.ac @@ -43,20 +43,14 @@ AC_SUBST(ARCH) case $with_arch in win32 | WIN32 ) - CONFIGFLAGS='CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar' - CROSSCOMPILE=i686-w64-mingw32- ENABLE64BIT= - TARGET=i686-unknown-mingw32 + TARGET=i686-w64-mingw32 ;; win64 | WIN64 | *) - CONFIGFLAGS='CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar' - CROSSCOMPILE=x86_64-w64-mingw32- ENABLE64BIT=--enable-64bit - TARGET=x86_64-unknown-mingw32 + TARGET=x86_64-w64-mingw32 ;; esac -AC_SUBST(CONFIGFLAGS) -AC_SUBST(CROSSCOMPILE) AC_SUBST(ENABLE64BIT) AC_SUBST(TARGET) |