diff --git a/.gitignore b/.gitignore index 47aab6e43..6dca26b41 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 ba8ea087e..5b63b7737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-01-08 Alexei Podtelezhnikov + + [builds] Revert `FTMODULE_H' changes. + + * builds/toplevel.mk, builds/freetype.mk: Revert changes. + 2021-01-07 Alexei Podtelezhnikov [builds/windows] Fix up DLG build with VC++. diff --git a/builds/freetype.mk b/builds/freetype.mk index 54ee9de05..71d3a48c8 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -119,7 +119,8 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A # in the `builds/' 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 186db046b..0cad54333 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)