shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2020-05-01  Alexei Podtelezhnikov  <[email protected]>

+

+	[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  <[email protected]>

 	Allow setting `CC' in Unix build (#58051).

--- a/builds/freetype.mk

+++ b/builds/freetype.mk

@@ -152,10 +152,8 @@

 #

 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.

@@ -162,9 +160,7 @@

 #

 FT_CFLAGS  = $(CPPFLAGS) \

              $(CFLAGS) \

-             $DFT2_BUILD_LIBRARY \

-             $DFT_CONFIG_MODULES_H="<ftmodule.h>" \

-             $(FTOPTION_FLAG)

+             $DFT2_BUILD_LIBRARY

 # Include the `exports' rules file.

--- a/builds/unix/unix-cc.in

+++ b/builds/unix/unix-cc.in

@@ -79,7 +79,10 @@

 #   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.

 #