aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2019-01-14 03:29:12 +0100
committerJay Berkenbilt <ejb@ql.org>2019-01-17 17:43:56 +0100
commit429ffcf397287cc94d6d4ec466c7576b9d6747a5 (patch)
tree230972f7b2edf6de89cbb8d84ae39762fd012c3b /make
parentc7fe2a94905409192d60834441df436f598ebd9b (diff)
downloadqpdf-429ffcf397287cc94d6d4ec466c7576b9d6747a5.tar.zst
Unicode main for Windows qpdf.cc
Diffstat (limited to 'make')
-rw-r--r--make/gcc-linux.mk6
-rw-r--r--make/libtool.mk6
-rw-r--r--make/mingw.mk6
-rw-r--r--make/msvc.mk6
4 files changed, 12 insertions, 12 deletions
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