[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 9c850f5: [builds/unix] Consolidate marco overrides (f
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2] master 9c850f5: [builds/unix] Consolidate marco overrides (for the demos to see them). |
Date: |
Fri, 1 May 2020 22:31:02 -0400 (EDT) |
branch: master
commit 9c850f5611a603b023d2b32a8186ea00e2092632
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
[builds/unix] Consolidate marco overrides (for the demos to see them).
* builds/unix/unix-cc.in (FT_CONFIG_MODULES_H, FT_CONFIG_OPTIONS_H):
Override them here...
* builds/freetype.mk: ... instead of here.
---
ChangeLog | 8 ++++++++
builds/freetype.mk | 6 +-----
builds/unix/unix-cc.in | 5 ++++-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f1ca56a..4e9ec3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-01 Alexei Podtelezhnikov <address@hidden>
+
+ [builds/unix] Consolidate marco overrides (for the demos to see them).
+
+ * builds/unix/unix-cc.in (FT_CONFIG_MODULES_H, FT_CONFIG_OPTIONS_H):
+ Override them here...
+ * builds/freetype.mk: ... instead of here.
+
2020-04-08 Werner Lemberg <address@hidden>
Allow setting `CC' in Unix build (#58051).
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 0df7d40..957d693 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -152,19 +152,15 @@ endif
#
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
FTOPTION_H := $(OBJ_DIR)/ftoption.h
- FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
FTOPTION_H := $(BUILD_DIR)/ftoption.h
- FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
endif
# `CPPFLAGS' might be specified by the user in the environment.
#
FT_CFLAGS = $(CPPFLAGS) \
$(CFLAGS) \
- $DFT2_BUILD_LIBRARY \
- $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
- $(FTOPTION_FLAG)
+ $DFT2_BUILD_LIBRARY
# Include the `exports' rules file.
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 470ac23..4338ded 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -79,7 +79,10 @@ T := -o$(space)
# We use our own FreeType configuration file.
#
CPPFLAGS := @CPPFLAGS@
-CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
+CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ \
+ $DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
+ $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
+ $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
#
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 9c850f5: [builds/unix] Consolidate marco overrides (for the demos to see them).,
Alexei Podtelezhnikov <=