add support for win32

3 files changed, 31 insertions, 11 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index f7c9eb3..9daac6a 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -15,6 +15,7 @@ EXEEXT		= @EXEEXT@
 JOBS		= @CORES@
 CONFIGFLAGS 	= @CONFIGFLAGS@
 CROSSCOMPILE	= @CROSSCOMPILE@
+ENABLE64BIT	= @ENABLE64BIT@
 
 ASTFLAGS	= CFLAGS=-DCMINPACK_NO_DLL
 XPAFLAGS	= CFLAGS=-DSTATIC_BUILD
@@ -22,7 +23,7 @@ TCLXMLFLAGS 	= --with-xml-static=yes
 TLSFLAGS	="CFLAGS=-DNO_IDEA=1 -DNO_RC5=1" --with-ssl-dir=$(prefix)/openssl
 include ./make.include
 
-WITHTCL		= --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win --enable-64bit
+WITHTCL		= --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win $(ENABLE64BIT)
 WITHTK		= --with-tk=$(prefix)/tk$(TCL_VERSION)/win $(WITHTCL)
 CACHE		= --config-cache --cache-file=$(prefix)/config.cache
 
@@ -55,7 +56,7 @@ tcl$(TCL_VERSION)/win/Makefile :
 	@echo "*** $@ ***"
 	cd tcl$(TCL_VERSION)/win; \
 	./configure \
-	--enable-64bit \
+	$(ENABLE64BIT) \
 	--prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \
 	--disable-shared \
 	--config-cache --cache-file=$(prefix)/config.cache
@@ -127,7 +128,7 @@ openssl/Makefile:
 	@echo ""
 	@echo "*** $@ ***"
 	cd openssl; \
-	export $(CROSSCOMPILE); \
+	export CROSS_COMPILE=$(CROSSCOMPILE); \
 	./Configure mingw64 --prefix=$(prefix) shared no-asm
 
 #--------------------------clean
diff --git a/win/configure b/win/configure
index b27cd13..f649c11 100755
--- a/win/configure
+++ b/win/configure
@@ -584,6 +584,9 @@ PACKAGE_URL=''
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CORES
+ENABLE64BIT
+CROSSCOMPILE
+CONFIGFLAGS
 ARCH
 OS
 PKG_CFLAGS
@@ -1858,6 +1861,22 @@ OS="win"
 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=
+	;;
+    win64 | WIN64 | *)
+	CONFIGFLAGS='CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar'
+	CROSSCOMPILE=x86_64-w64-mingw32-
+	ENABLE64BIT=--enable-64bit
+	;;
+esac
+
+
+
+
 prefix=$ac_pwd
 exec_prefix=$ac_pwd
 
diff --git a/win/configure.ac b/win/configure.ac
index 20b4360..83f52c8 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.
-n# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
+# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
 # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
 #--------------------------------------------------------------------
 
@@ -42,20 +42,20 @@ ARCH=$with_arch
 AC_SUBST(ARCH)
 
 case $with_arch in
-    win32 )
-    WIN32 )
-	CONFIGFLAGS= CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar
+    win32 | WIN32 )
+	CONFIGFLAGS='CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar'
 	CROSSCOMPILE=i686-w64-mingw32-
+	ENABLE64BIT=
 	;;
-    win64 )
-    WIN64 )
-    *)
-	CONFIGFLAGS= CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar
+    win64 | WIN64 | *)
+	CONFIGFLAGS='CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar'
 	CROSSCOMPILE=x86_64-w64-mingw32-
+	ENABLE64BIT=--enable-64bit
 	;;
 esac
 AC_SUBST(CONFIGFLAGS)
 AC_SUBST(CROSSCOMPILE)
+AC_SUBST(ENABLE64BIT)
 
 prefix=$ac_pwd
 exec_prefix=$ac_pwd