rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated freetype.mk to build dlg

This commit is contained in:
Priyeshkkumar 2020-07-21 15:43:04 +05:30
parent 1e1912dbac
commit df53385b67
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
[priyesh]ChangeLog
View File

@ -1,3 +1,10 @@
2020-07-21 Priyesh Kumar <priyeshkkumar@gmail.com>
* builds/freetype.mk: Updates to build dlg along with rest of base and
module objects.
* autogen.sh: Minor changes.
2020-07-20 Priyesh Kumar <priyeshkkumar@gmail.com>
* Changed git submodule(dlg) from `src/dlg` to `submodules/dlg`

2
autogen.sh
View File

@ -174,7 +174,7 @@ DLG_INC_DIR=submodules/dlg/include/dlg
DLG_SRC_DIR=submodules/dlg/src/dlg
if ! test -d "$DLG_INC_DIR"; then
echo "Submodule check out:"
echo "Submodule check out in \`submodules/dlg':"
git submodule init
git submodule update

5
builds/freetype.mk
View File

@ -220,6 +220,7 @@ $(FTDEBUG_OBJ): $(FTDEBUG_SRC) $(FREETYPE_H)
#
include $(SRC_DIR)/base/rules.mk
include $(patsubst %,$(SRC_DIR)/%/rules.mk,$(MODULES))
include $(SRC_DIR)/dlg/rules.mk
# ftinit component
@ -260,8 +261,8 @@ endif
# All FreeType library objects.
#
OBJ_M := $(BASE_OBJ_M) $(BASE_EXT_OBJ) $(DRV_OBJS_M)
OBJ_S := $(BASE_OBJ_S) $(BASE_EXT_OBJ) $(DRV_OBJS_S)
OBJ_M := $(BASE_OBJ_M) $(BASE_EXT_OBJ) $(DRV_OBJS_M) $(DLG_OBJS_M)
OBJ_S := $(BASE_OBJ_S) $(BASE_EXT_OBJ) $(DRV_OBJS_S) $(DLG_OBJS_S)
# The target `multi' on the Make command line indicates that we want to