[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] logging d3abc3c: Synchronize with recent FreeType chan
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] logging d3abc3c: Synchronize with recent FreeType changes. |
Date: |
Fri, 4 Dec 2020 10:21:27 -0500 (EST) |
branch: logging
commit d3abc3c682c0e099f9cba27ba4c488f4edcc31f7
Author: Priyeshkkumar <priyeshkkumar@gmail.com>
Commit: Werner Lemberg <wl@gnu.org>
Synchronize with recent FreeType changes.
* Makefile (FT_INCLUDES): Add `$(TOP_DIR)/src/dlg` to include 'dlg'
header files.
(LINK_LIBS): Add `-lpthread'.
---
ChangeLog | 8 ++++++++
Makefile | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 06a7a32..162fafa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-12-01 Priyesh Kumar <priyeshkkumar@gmail.com>
+
+ Synchronize with recent FreeType changes.
+
+ * Makefile (FT_INCLUDES): Add `$(TOP_DIR)/src/dlg` to include 'dlg'
+ header files.
+ (LINK_LIBS): Add `-lpthread'.
+
2020-11-18 Werner Lemberg <wl@gnu.org>
[ftmulti]: Keys 'i' and 'I' now control the axis increment.
diff --git a/Makefile b/Makefile
index 851c4f7..7d79738 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,7 @@ else
FT_INCLUDES := $(OBJ_BUILD) \
$(DEVEL_DIR) \
$(TOP_DIR)/include \
+ $(TOP_DIR)/src/dlg \
$(SRC_DIR)
COMPILE = $(CC) $(ANSIFLAGS) \
@@ -172,7 +173,7 @@ else
else
LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
ifeq ($(PLATFORM),unixdev)
- LINK_LIBS := $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lrt -lz
-lbz2
+ LINK_LIBS := $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lrt -lz
-lbz2 -lpthread
LINK_LIBS += $(shell pkg-config --libs libpng)
LINK_LIBS += $(shell pkg-config --libs harfbuzz)
LINK_LIBS += $(shell pkg-config --libs libbrotlidec)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] logging d3abc3c: Synchronize with recent FreeType changes.,
Werner LEMBERG <=