From 429ffcf397287cc94d6d4ec466c7576b9d6747a5 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 13 Jan 2019 21:29:12 -0500 Subject: Unicode main for Windows qpdf.cc --- make/gcc-linux.mk | 6 +++--- make/libtool.mk | 6 +++--- make/mingw.mk | 6 +++--- make/msvc.mk | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'make') diff --git a/make/gcc-linux.mk b/make/gcc-linux.mk index d34ecf04..490b314c 100644 --- a/make/gcc-linux.mk +++ b/make/gcc-linux.mk @@ -22,10 +22,10 @@ endef # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(3)\ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call src_to_obj,$(1)) diff --git a/make/libtool.mk b/make/libtool.mk index e68bea4c..34b0fe2c 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -37,10 +37,10 @@ endif # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CXXFLAGS) \ + $(CXX) $(CXXFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ $(CPPFLAGS) \ diff --git a/make/mingw.mk b/make/mingw.mk index fbfbee9e..235149ff 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -15,10 +15,10 @@ endef # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call src_to_obj,$(1)) diff --git a/make/msvc.mk b/make/msvc.mk index 4af234c3..1dafbcf0 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -24,10 +24,10 @@ clean:: # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) $(3) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -Fo$(call src_to_obj,$(1)) endef -- cgit v1.2.3-54-g00ecf