diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2012-06-21 20:06:54 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2012-06-22 03:22:35 +0200 |
| commit | c833295a3948e914fa23042896f19f35ddd8d927 (patch) | |
| tree | d2c135487757ad8ad917242e8e6c42097a016fd4 /make | |
| parent | 85d9e7dfed31cf4b9307fad920422a7b433fc35c (diff) | |
| download | qpdf-c833295a3948e914fa23042896f19f35ddd8d927.tar.zst | |
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.
Diffstat (limited to 'make')
| -rw-r--r-- | make/installwin.mk | 2 | ||||
| -rw-r--r-- | make/mingw.mk | 8 | ||||
| -rw-r--r-- | make/msvc.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/make/installwin.mk b/make/installwin.mk index 6b88efad..e3401d83 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -10,7 +10,7 @@ installwin: all mkdir $(DEST)/doc cp libqpdf/$(OUTPUT_DIR)/$(STATIC_LIB_NAME) $(DEST)/lib cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin - perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin + perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin $(OBJDUMP) cp qpdf/$(OUTPUT_DIR)/qpdf.exe $(DEST)/bin cp zlib-flate/$(OUTPUT_DIR)/zlib-flate.exe $(DEST)/bin cp qpdf/fix-qdf $(DEST)/bin 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 diff --git a/make/msvc.mk b/make/msvc.mk index 8ad7f589..5f3f69ad 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -101,7 +101,7 @@ endef # Install target -INSTALL_DIR = install-msvc +INSTALL_DIR = install-msvc$(WINDOWS_WORDSIZE) STATIC_LIB_NAME = qpdf.lib include make/installwin.mk install: installwin |