some updates to the "rules.mk" files. Basically, we now
use "$(FT_COMPILE)" instead of "$(FT_CC)" in order to compile the library. $(FT_COMPILE) uses the $(ANSI_FLAGS) variable used to define ANSI-compliance flags for the current compiler. It is used to compile the library exclusively (some demo programs will _not_ compile properly with these flags set).
This commit is contained in:
parent
3b925ef744
commit
3ba47068a6
|
@ -124,13 +124,13 @@ BASE_SRC_S := $(BASE_)ftbase.c
|
||||||
# Multiple objects build + extensions
|
# Multiple objects build + extensions
|
||||||
#
|
#
|
||||||
$(OBJ_)ft%.$O: $(BASE_)ft%.c $(PUBLIC_H) $(BASE_H)
|
$(OBJ_)ft%.$O: $(BASE_)ft%.c $(PUBLIC_H) $(BASE_H)
|
||||||
$(FT_CC) $T$@ $<
|
$(FT_COMPILE) $T$@ $<
|
||||||
|
|
||||||
|
|
||||||
# Base layer - single object build
|
# Base layer - single object build
|
||||||
#
|
#
|
||||||
$(BASE_OBJ_S): $(PUBLIC_H) $(BASE_H) $(BASE_SRC_S) $(BASE_SRC)
|
$(BASE_OBJ_S): $(PUBLIC_H) $(BASE_H) $(BASE_SRC_S) $(BASE_SRC)
|
||||||
$(FT_CC) $T$@ $(BASE_SRC_S)
|
$(FT_COMPILE) $T$@ $(BASE_SRC_S)
|
||||||
|
|
||||||
|
|
||||||
# END
|
# END
|
||||||
|
|
|
@ -99,7 +99,7 @@ SFNT_INCLUDE := $(SHARED) $(SFNT_DIR)
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
SFNT_CFLAGS := $(SFNT_INCLUDE:%=$I%)
|
SFNT_CFLAGS := $(SFNT_INCLUDE:%=$I%)
|
||||||
SFNT_COMPILE := $(FT_CC) $(SFNT_CFLAGS)
|
SFNT_COMPILE := $(FT_COMPILE) $(SFNT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# TrueType driver sources (i.e., C files)
|
# TrueType driver sources (i.e., C files)
|
||||||
|
|
|
@ -106,7 +106,7 @@ TT_INCLUDE := $(SFNT_INCLUDE) $(TT_DIR) $(TT_EXT_DIR)
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
TT_CFLAGS := $(TT_INCLUDE:%=$I%)
|
TT_CFLAGS := $(TT_INCLUDE:%=$I%)
|
||||||
TT_COMPILE := $(FT_CC) $(TT_CFLAGS)
|
TT_COMPILE := $(FT_COMPILE) $(TT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# TrueType driver sources (i.e., C files)
|
# TrueType driver sources (i.e., C files)
|
||||||
|
|
|
@ -91,7 +91,7 @@ T1_DIR_ := $(T1_DIR)$(SEP)
|
||||||
# additional include flags used when compiling the driver
|
# additional include flags used when compiling the driver
|
||||||
#
|
#
|
||||||
T1_INCLUDE := $(SHARED) $(T1_DIR)
|
T1_INCLUDE := $(SHARED) $(T1_DIR)
|
||||||
T1_COMPILE := $(FT_CC) $(T1_INCLUDE:%=$I%)
|
T1_COMPILE := $(FT_COMPILE) $(T1_INCLUDE:%=$I%)
|
||||||
|
|
||||||
|
|
||||||
# Type1 driver sources (i.e., C files)
|
# Type1 driver sources (i.e., C files)
|
||||||
|
@ -101,7 +101,7 @@ T1_DRV_SRC := $(T1_DIR_)t1objs.c \
|
||||||
$(T1_DIR_)t1parse.c \
|
$(T1_DIR_)t1parse.c \
|
||||||
$(T1_DIR_)t1tokens.c \
|
$(T1_DIR_)t1tokens.c \
|
||||||
$(T1_DIR_)t1driver.c \
|
$(T1_DIR_)t1driver.c \
|
||||||
$(T1_DIR_)t1encode.c \
|
$(T1_DIR_)t1encode.c \
|
||||||
$(T1_DIR_)t1hinter.c \
|
$(T1_DIR_)t1hinter.c \
|
||||||
$(T1_DIR_)t1gload.c
|
$(T1_DIR_)t1gload.c
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue