ref: 34315538364b2e1ab7fb17d70dd59bb451982c80
parent: 0901a6f74c707f4e631d810b9f3ac7f0c0d2042e
author: Alexei Podtelezhnikov <[email protected]>
date: Fri Jan 8 08:22:34 EST 2021
[builds] Revert `FTMODULE_H' changes. * builds/toplevel.mk, builds/freetype.mk: Revert changes.
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
build
config.mk
-include/ftmodule.h
include/dlg/
src/dlg/dlg.c
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-01-08 Alexei Podtelezhnikov <[email protected]>
+
+ [builds] Revert `FTMODULE_H' changes.
+
+ * builds/toplevel.mk, builds/freetype.mk: Revert changes.
+
2021-01-07 Alexei Podtelezhnikov <[email protected]>
[builds/windows] Fix up DLG build with VC++.
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -119,7 +119,8 @@
# in the `builds/<system>' directory, as these files will
# override the default sources.
#
-INCLUDES := $(subst /,$(COMPILER_SEP),$(DEVEL_DIR) \
+INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
+ $(DEVEL_DIR) \
$(BUILD_DIR) \
$(TOP_DIR)/include)
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -68,7 +68,7 @@
# FTMODULE_H, as its name suggests, indicates where the FreeType module
# class file resides.
#
-FTMODULE_H ?= $(TOP_DIR)/include/ftmodule.h
+FTMODULE_H ?= $(OBJ_DIR)/ftmodule.h
include $(MODULES_CFG)