diff options
author | Jay Berkenbilt <ejb@ql.org> | 2019-11-09 21:01:15 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2019-11-10 00:50:42 +0100 |
commit | 07da0039d3f496871d746305fbbf76ee9bde9862 (patch) | |
tree | 2bd79ba09951f77ba2d2866c339b2f73313a25c2 /make | |
parent | a58918bb8756c7c8efb12a6a283cc7f879565141 (diff) | |
download | qpdf-07da0039d3f496871d746305fbbf76ee9bde9862.tar.zst |
Link with setargv or wsetargv with MSVC (fixes #224)
For wildcard expansion to work properly with the msvc binary, it is
necessary to link with setargv.obj or wsetargv.obj, depending on
whether wmain is in use.
Diffstat (limited to 'make')
-rw-r--r-- | make/libtool.mk | 6 | ||||
-rw-r--r-- | make/mingw.mk | 6 | ||||
-rw-r--r-- | make/msvc.mk | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/make/libtool.mk b/make/libtool.mk index 41944b70..0aa7b0d7 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -98,10 +98,10 @@ define makelib -rpath $(libdir) -version-info $(5):$(6):$(7) -no-undefined endef -# 1 2 3 4 -# Usage: $(call makebin,objs,binary,ldflags,libs) +# 1 2 3 4 5 +# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) define makebin - $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4) + $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4) endef # Install target diff --git a/make/mingw.mk b/make/mingw.mk index 235149ff..9689ef94 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -67,10 +67,10 @@ define makelib $(1) $(3) $(4) endef -# 1 2 3 4 -# Usage: $(call makebin,objs,binary,ldflags,libs) +# 1 2 3 4 5 +# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) define makebin - $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4) + $(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4) endef # Install target diff --git a/make/msvc.mk b/make/msvc.mk index 1dafbcf0..108ce3b6 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -76,10 +76,11 @@ define makelib mv $(basename $(2))$(shell expr $(5) - $(7)).lib $(2) endef -# 1 2 3 4 -# Usage: $(call makebin,objs,binary,ldflags,libs) +# 1 2 3 4 5 +# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) define makebin cl -nologo -O2 -Zi -Gy -EHsc -MD $(1) \ + $(if $(5),$(5),$(WINDOWS_MAIN_XLINK_FLAGS)) \ -link -SUBSYSTEM:CONSOLE,5.01 -incremental:no -OUT:$(2) \ $(foreach L,$(subst -L,,$(3)),-LIBPATH:$(L)) \ $(foreach L,$(subst -l,,$(4)),$(L).lib) |