diff options
Diffstat (limited to 'make/mingw.mk')
| -rw-r--r-- | make/mingw.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/make/mingw.mk b/make/mingw.mk index f0442c96..ae599393 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -44,17 +44,16 @@ define makeslib $(RANLIB) $(2) endef -# 1 2 3 4 5 -# Usage: $(call makelib,objs,library,current,revision,age) +# 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,'`$(3).dll) $(1); \ - $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll \ - $(1) $(LDFLAGS) $(LIBS) + dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll) $(1); \ + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll \ + $(1) $(3) $(4) endef -# 1 2 -# Usage: $(call makebin,objs,binary) +# 1 2 3 4 +# Usage: $(call makebin,objs,binary,ldflags,libs) define makebin - $(CXX) $(CXXFLAGS) $(1) -o $(2) $(LDFLAGS) \ - -Llibqpdf/$(OUTPUT_DIR) -lqpdf $(LIBS) + $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4) endef |