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 /qpdf | |
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 'qpdf')
-rw-r--r-- | qpdf/build.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qpdf/build.mk b/qpdf/build.mk index 2b14266a..44916f93 100644 --- a/qpdf/build.mk +++ b/qpdf/build.mk @@ -26,6 +26,8 @@ XCXXFLAGS_qpdf_qpdf := $(WINDOWS_WMAIN_COMPILE) XLDFLAGS_qpdf_qpdf := $(WINDOWS_WMAIN_LINK) XCXXFLAGS_qpdf_test_unicode_filenames := $(WINDOWS_WMAIN_COMPILE) XLDFLAGS_qpdf_test_unicode_filenames := $(WINDOWS_WMAIN_LINK) +XLINK_FLAGS_qpdf_qpdf := $(WINDOWS_WMAIN_XLINK_FLAGS) +XLINK_FLAGS_qpdf_test_unicode_filenames := $(WINDOWS_WMAIN_XLINK_FLAGS) $(foreach B,$(BINS_qpdf),$(eval \ OBJS_$(B) = $(call src_to_obj,qpdf/$(B).cc))) @@ -46,4 +48,4 @@ $(foreach B,$(CBINS_qpdf),$(eval \ $(foreach B,$(BINS_qpdf) $(CBINS_qpdf),$(eval \ qpdf/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \ - $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS) $(XLDFLAGS_qpdf_$(B)),$(LIBS_libqpdf) $(LIBS)))) + $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS) $(XLDFLAGS_qpdf_$(B)),$(LIBS_libqpdf) $(LIBS),$(XLINK_FLAGS_qpdf_$(B))))) |