From e37ce851902af9a0c54508a693024ceaccf49abd Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 14 Aug 2018 16:28:52 -0400 Subject: Clarify static vs. import library on Windows (fixes #225) --- make/mingw.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'make/mingw.mk') diff --git a/make/mingw.mk b/make/mingw.mk index 00119d1a..fbfbee9e 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -5,7 +5,7 @@ LOBJ=o # Usage: $(call libname,base) define libname -lib$(1).a +lib$(1).dll.a endef # Usage: $(call binname,base) @@ -62,8 +62,8 @@ 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); \ - $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \ + $(DLLTOOL) -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).dll.a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \ + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).dll.a,/\1,'`$(shell expr $(5) - $(7)).dll \ $(1) $(3) $(4) endef @@ -76,7 +76,6 @@ endef # Install target INSTALL_DIR = install-mingw$(WINDOWS_WORDSIZE) -STATIC_LIB_NAME = libqpdf.a include make/installwin.mk install: installwin $(STRIP) $(DEST)/bin/*.exe -- cgit v1.2.3-54-g00ecf