diff options
author | Jay Berkenbilt <ejb@ql.org> | 2020-10-15 22:47:35 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2020-10-16 13:02:23 +0200 |
commit | ff65e272a8f8e647a3db5187e5c4594ff01cbd34 (patch) | |
tree | cb86bf74c0b5c6d1d1f49a3dbcf519ac4fe3cbe2 /make | |
parent | be21ede7ba05027829adaf7275e9bbbc1574a760 (diff) | |
download | qpdf-ff65e272a8f8e647a3db5187e5c4594ff01cbd34.tar.zst |
Fix printf formatting for newer msvc
Use autoconf rather than ifdefs to determine what format string to use
for long long.
Diffstat (limited to 'make')
-rw-r--r-- | make/libtool.mk | 6 | ||||
-rw-r--r-- | make/mingw.mk | 6 | ||||
-rw-r--r-- | make/msvc.mk | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/make/libtool.mk b/make/libtool.mk index abd0aa7e..1ab92b75 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -47,10 +47,10 @@ define compile -c $(1) -o $(call src_to_obj,$(1)) endef -# 1 2 -# Usage: $(call c_compile,src,includes) +# 1 2 3 +# Usage: $(call c_compile,src,includes,xflags) define c_compile - $(CC) $(CFLAGS) \ + $(CC) $(CFLAGS) $(3) \ $(call depflags,$(basename $(call c_src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ $(CPPFLAGS) \ diff --git a/make/mingw.mk b/make/mingw.mk index 9689ef94..20d648b0 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -24,10 +24,10 @@ define compile -c $(1) -o $(call src_to_obj,$(1)) endef -# 1 2 -# Usage: $(call c_compile,src,includes) +# 1 2 3 +# Usage: $(call c_compile,src,includes,xflags) define c_compile - $(CC) $(CPPFLAGS) $(CFLAGS) \ + $(CC) $(CPPFLAGS) $(CFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call c_src_to_obj,$(1)) diff --git a/make/msvc.mk b/make/msvc.mk index 108ce3b6..c8bc57bc 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -32,10 +32,10 @@ define compile -c $(1) -Fo$(call src_to_obj,$(1)) endef -# 1 2 -# Usage: $(call c_compile,src,includes) +# 1 2 3 +# Usage: $(call c_compile,src,includes,xflags) define c_compile - cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CFLAGS) $(3) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -Fo$(call c_src_to_obj,$(1)) endef |