diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 17:37:37 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-05-03 17:37:37 (GMT) |
| commit | a44acdea748896ea069c0fde988504a23f6193a1 (patch) | |
| tree | 2175ca05d1e6d59c0a4ec95bf9c19d942fcf0fff /win | |
| parent | 105878ba114ead35390129e837493fa519e4c3e3 (diff) | |
| download | blt-a44acdea748896ea069c0fde988504a23f6193a1.zip blt-a44acdea748896ea069c0fde988504a23f6193a1.tar.gz blt-a44acdea748896ea069c0fde988504a23f6193a1.tar.bz2 | |
add support win32
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 10 | ||||
| -rwxr-xr-x | win/configure.ac | 18 |
2 files changed, 20 insertions, 8 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 794693b..f7c9eb3 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -13,17 +13,13 @@ OS = @OS@ ARCH = @ARCH@ EXEEXT = @EXEEXT@ JOBS = @CORES@ +CONFIGFLAGS = @CONFIGFLAGS@ +CROSSCOMPILE = @CROSSCOMPILE@ -#CONFIGFLAGS = CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar -CONFIGFLAGS = CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar ASTFLAGS = CFLAGS=-DCMINPACK_NO_DLL XPAFLAGS = CFLAGS=-DSTATIC_BUILD TCLXMLFLAGS = --with-xml-static=yes TLSFLAGS ="CFLAGS=-DNO_IDEA=1 -DNO_RC5=1" --with-ssl-dir=$(prefix)/openssl -TARGET = --build=x86_64-unknown-mingw32 - -FFLAGS = CPP='x86_64-w64-mingw32-gcc -E' CC=x86_64-w64-mingw32-gcc LD=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar - include ./make.include WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win --enable-64bit @@ -131,7 +127,7 @@ openssl/Makefile: @echo "" @echo "*** $@ ***" cd openssl; \ - export CROSS_COMPILE=x86_64-w64-mingw32-; \ + export $(CROSSCOMPILE); \ ./Configure mingw64 --prefix=$(prefix) shared no-asm #--------------------------clean diff --git a/win/configure.ac b/win/configure.ac index b50272a..20b4360 100755 --- a/win/configure.ac +++ b/win/configure.ac @@ -23,7 +23,7 @@ AC_INIT([saods9], [7.6]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. -# This will define a ${TEA_PLATFORM} variable == "unix" or "windows" +n# This will define a ${TEA_PLATFORM} variable == "unix" or "windows" # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. #-------------------------------------------------------------------- @@ -41,6 +41,22 @@ AC_SUBST(OS) ARCH=$with_arch AC_SUBST(ARCH) +case $with_arch in + win32 ) + WIN32 ) + CONFIGFLAGS= CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar + CROSSCOMPILE=i686-w64-mingw32- + ;; + win64 ) + WIN64 ) + *) + CONFIGFLAGS= CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar + CROSSCOMPILE=x86_64-w64-mingw32- + ;; +esac +AC_SUBST(CONFIGFLAGS) +AC_SUBST(CROSSCOMPILE) + prefix=$ac_pwd exec_prefix=$ac_pwd |