From c833295a3948e914fa23042896f19f35ddd8d927 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 21 Jun 2012 14:06:54 -0400
Subject: Adjust Windows built to support 32-bit and 64-bit builds

Update the build to support new external-libs layout, and autoconf
options to specify windows word size.  Split make_windows_releases
into multiple scripts.
---
 make/mingw.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'make/mingw.mk')

diff --git a/make/mingw.mk b/make/mingw.mk
index e6d06f5f..00119d1a 100644
--- a/make/mingw.mk
+++ b/make/mingw.mk
@@ -62,7 +62,7 @@ endef
 #                       1    2       3       4    5       6        7
 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
-	dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \
+	$(DLLTOOL) -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \
 	$(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \
 		$(1) $(3) $(4)
 endef
@@ -75,9 +75,9 @@ endef
 
 # Install target
 
-INSTALL_DIR = install-mingw
+INSTALL_DIR = install-mingw$(WINDOWS_WORDSIZE)
 STATIC_LIB_NAME = libqpdf.a
 include make/installwin.mk
 install: installwin
-	strip $(DEST)/bin/*.exe
-	strip $(DEST)/bin/*.dll
+	$(STRIP) $(DEST)/bin/*.exe
+	$(STRIP) $(DEST)/bin/*.dll
-- 
cgit v1.2.3-54-g00ecf