freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] priyesh_LogLibrary df53385: Updated freetype.mk to build dlg


From: Priyesh Kumar
Subject: [freetype2] priyesh_LogLibrary df53385: Updated freetype.mk to build dlg
Date: Tue, 21 Jul 2020 06:13:37 -0400 (EDT)

branch: priyesh_LogLibrary
commit df53385b6735a931afe4b4a613259357f22718ec
Author: Priyeshkkumar <priyeshkkumar@gmail.com>
Commit: Priyeshkkumar <priyeshkkumar@gmail.com>

    Updated freetype.mk to build dlg
---
 [priyesh]ChangeLog | 7 +++++++
 autogen.sh         | 2 +-
 builds/freetype.mk | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[priyesh]ChangeLog b/[priyesh]ChangeLog
index 8a68e8e..ec9d9c6 100644
--- a/[priyesh]ChangeLog
+++ b/[priyesh]ChangeLog
@@ -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`
diff --git a/autogen.sh b/autogen.sh
index 089350d..f84c956 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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
   
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 1d7eeb6..60ff481 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -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



reply via email to

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