forked from minhngoc25a/freetype2
[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.
This commit is contained in:
parent
d79946311b
commit
9c850f5611
|
@ -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>
|
2020-04-08 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Allow setting `CC' in Unix build (#58051).
|
Allow setting `CC' in Unix build (#58051).
|
||||||
|
|
|
@ -152,19 +152,15 @@ endif
|
||||||
#
|
#
|
||||||
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
|
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
|
||||||
FTOPTION_H := $(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),)
|
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
|
||||||
FTOPTION_H := $(BUILD_DIR)/ftoption.h
|
FTOPTION_H := $(BUILD_DIR)/ftoption.h
|
||||||
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# `CPPFLAGS' might be specified by the user in the environment.
|
# `CPPFLAGS' might be specified by the user in the environment.
|
||||||
#
|
#
|
||||||
FT_CFLAGS = $(CPPFLAGS) \
|
FT_CFLAGS = $(CPPFLAGS) \
|
||||||
$(CFLAGS) \
|
$(CFLAGS) \
|
||||||
$DFT2_BUILD_LIBRARY \
|
$DFT2_BUILD_LIBRARY
|
||||||
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
|
|
||||||
$(FTOPTION_FLAG)
|
|
||||||
|
|
||||||
|
|
||||||
# Include the `exports' rules file.
|
# Include the `exports' rules file.
|
||||||
|
|
|
@ -79,7 +79,10 @@ T := -o$(space)
|
||||||
# We use our own FreeType configuration file.
|
# We use our own FreeType configuration file.
|
||||||
#
|
#
|
||||||
CPPFLAGS := @CPPFLAGS@
|
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.
|
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue