commit 34315538364b2e1ab7fb17d70dd59bb451982c80
author Alexei Podtelezhnikov <apodtele@gmail.com> Fri Jan 08 13:22:34 2021 -0500
committer Alexei Podtelezhnikov <apodtele@gmail.com> Fri Jan 08 13:22:34 2021 -0500
tree 6f3667125f3fa45b9696b655f539fb7f5c42eb66
parent 0901a6f74c707f4e631d810b9f3ac7f0c0d2042e

[builds] Revert `FTMODULE_H' changes.

* builds/toplevel.mk, builds/freetype.mk: Revert changes.

.gitignore

diff --git a/.gitignore b/.gitignore
index 47aab6e..6dca26b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 build
 config.mk
-include/ftmodule.h
 include/dlg/
 src/dlg/dlg.c

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ba8ea08..5b63b77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-01-08  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[builds] Revert `FTMODULE_H' changes.
+
+	* builds/toplevel.mk, builds/freetype.mk: Revert changes.
+
 2021-01-07  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[builds/windows] Fix up DLG build with VC++.

builds/freetype.mk

diff --git a/builds/freetype.mk b/builds/freetype.mk
index 54ee9de..71d3a48 100644
--- 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)
 

builds/toplevel.mk

diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 186db04..0cad543 100644
--- 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)