diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2016-01-24 21:51:21 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2017-07-26 12:24:07 +0200 |
| commit | e0ee307a199fcf47523b395ce99052ec51e69476 (patch) | |
| tree | 92441c40398bb68c7633dacd6cd55a07a771f56e /make | |
| parent | d4d7612b5b14ad3b1fb2e21e04017369931ae203 (diff) | |
| download | qpdf-e0ee307a199fcf47523b395ce99052ec51e69476.tar.zst | |
Updates for newer Windows toolchain
Diffstat (limited to 'make')
| -rw-r--r-- | make/installwin.mk | 2 | ||||
| -rw-r--r-- | make/msvc.mk | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/make/installwin.mk b/make/installwin.mk index e3401d83..f4bc411e 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -10,7 +10,7 @@ installwin: all mkdir $(DEST)/doc cp libqpdf/$(OUTPUT_DIR)/$(STATIC_LIB_NAME) $(DEST)/lib cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin - perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin $(OBJDUMP) + perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin $(OBJDUMP) $(WINDOWS_WORDSIZE) cp qpdf/$(OUTPUT_DIR)/qpdf.exe $(DEST)/bin cp zlib-flate/$(OUTPUT_DIR)/zlib-flate.exe $(DEST)/bin cp qpdf/fix-qdf $(DEST)/bin diff --git a/make/msvc.mk b/make/msvc.mk index a8681173..3e061091 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -27,47 +27,47 @@ clean:: # 1 2 # Usage: $(call compile,src,includes) define compile - cl /nologo /O2 /Zi /Gy /EHsc /MD /TP /GR $(CPPFLAGS) $(CXXFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) \ $(foreach I,$(2),-I$(I)) \ - /c $(1) /Fo$(call src_to_obj,$(1)) + -c $(1) -Fo$(call src_to_obj,$(1)) endef # 1 2 # Usage: $(call c_compile,src,includes) define c_compile - cl /nologo /O2 /Zi /Gy /EHsc /MD $(CPPFLAGS) $(CFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CFLAGS) \ $(foreach I,$(2),-I$(I)) \ - /c $(1) /Fo$(call c_src_to_obj,$(1)) + -c $(1) -Fo$(call c_src_to_obj,$(1)) endef # 1 2 # Usage: $(call libcompile,src,includes) define libcompile - cl /nologo /O2 /Zi /Gy /EHsc /MD /TP /GR $(CPPFLAGS) $(CXXFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) \ -DDLL_EXPORT $(foreach I,$(2),-I$(I)) \ - /c $(1) /Fo$(call src_to_obj,$(1)) + -c $(1) -Fo$(call src_to_obj,$(1)) endef # 1 2 # Usage: $(call c_libcompile,src,includes) define c_libcompile - cl /nologo /O2 /Zi /Gy /EHsc /MD $(CPPFLAGS) $(CXXFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CXXFLAGS) \ -DDLL_EXPORT $(foreach I,$(2),-I$(I)) \ - /c $(1) /Fo$(call c_src_to_obj,$(1)) + -c $(1) -Fo$(call c_src_to_obj,$(1)) endef # 1 2 # Usage: $(call makeslib,objs,library) define makeslib - lib /nologo /OUT:$(2) $(1) + lib -nologo -OUT:$(2) $(1) endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(shell expr $(5) - $(7)).dll $(1) \ - /link /SUBSYSTEM:CONSOLE,5.01 /incremental:no \ - $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD -LD -Fe$(basename $(2))$(shell expr $(5) - $(7)).dll $(1) \ + -link -SUBSYSTEM:CONSOLE,5.01 -incremental:no \ + $(foreach L,$(subst -L,,$(3)),-LIBPATH:$(L)) \ $(foreach L,$(subst -l,,$(4)),$(L).lib) if [ -f $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest ]; then \ mt.exe -nologo -manifest $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest \ @@ -79,9 +79,9 @@ endef # 1 2 3 4 # Usage: $(call makebin,objs,binary,ldflags,libs) define makebin - cl /nologo /O2 /Zi /Gy /EHsc /MD $(1) \ - /link /SUBSYSTEM:CONSOLE,5.01 /incremental:no /OUT:$(2) \ - $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD $(1) \ + -link -SUBSYSTEM:CONSOLE,5.01 -incremental:no -OUT:$(2) \ + $(foreach L,$(subst -L,,$(3)),-LIBPATH:$(L)) \ $(foreach L,$(subst -l,,$(4)),$(L).lib) if [ -f $(2).manifest ]; then \ mt.exe -nologo -manifest $(2).manifest \ |