diff options
Diffstat (limited to 'make/mingw.mk')
-rw-r--r-- | make/mingw.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/make/mingw.mk b/make/mingw.mk index 00119d1a..235149ff 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) @@ -15,10 +15,10 @@ endef # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call src_to_obj,$(1)) @@ -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 |