freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 3431553: [builds] Revert `FTMODULE_H' changes.


From: Alexei Podtelezhnikov
Subject: [freetype2] master 3431553: [builds] Revert `FTMODULE_H' changes.
Date: Fri, 8 Jan 2021 13:23:06 -0500 (EST)

branch: master
commit 34315538364b2e1ab7fb17d70dd59bb451982c80
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [builds] Revert `FTMODULE_H' changes.
    
    * builds/toplevel.mk, builds/freetype.mk: Revert changes.
---
 .gitignore         | 1 -
 ChangeLog          | 6 ++++++
 builds/freetype.mk | 3 ++-
 builds/toplevel.mk | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

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
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++.
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 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
 #                 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)
 
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 @@ endif
 # 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]