diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2020-05-01 22:30:15 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2020-05-01 22:30:15 -0400 |
| commit | 9c850f5611a603b023d2b32a8186ea00e2092632 (patch) | |
| tree | addba1d7e111093f54cb95cc24c221084ac369b6 | |
| parent | d79946311bf8c72d31a8dadc8ae33e298554c61b (diff) | |
| download | freetype2-9c850f5611a603b023d2b32a8186ea00e2092632.tar.gz | |
[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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | builds/freetype.mk | 6 | ||||
| -rw-r--r-- | builds/unix/unix-cc.in | 5 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2020-05-01 Alexei Podtelezhnikov <apodtele@gmail.com> + + [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 <wl@gnu.org> Allow setting `CC' in Unix build (#58051). diff --git a/builds/freetype.mk b/builds/freetype.mk index 0df7d4082..957d69393 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 470ac23d8..4338deded 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. # |