[builds] Revert `FTMODULE_H' changes.

* builds/toplevel.mk, builds/freetype.mk: Revert changes.
wl/meson-logging
Alexei Podtelezhnikov 4 years ago
parent 0901a6f74c
commit 3431553836
  1. 1
      .gitignore
  2. 6
      ChangeLog
  3. 3
      builds/freetype.mk
  4. 2
      builds/toplevel.mk

1
.gitignore vendored

@ -1,5 +1,4 @@
build
config.mk
include/ftmodule.h
include/dlg/
src/dlg/dlg.c

@ -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++.

@ -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)

@ -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)

Loading…
Cancel
Save