freetype-commit
[Top][All Lists]
Advanced

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

[freetype2-demos] master 6cf2fc0 1/2: * Makefile [unixdev]: Uncouple har


From: Alexei Podtelezhnikov
Subject: [freetype2-demos] master 6cf2fc0 1/2: * Makefile [unixdev]: Uncouple harfbuzz and libpng.
Date: Wed, 23 May 2018 22:17:04 -0400 (EDT)

branch: master
commit 6cf2fc0109e9676c0e030fc6afe2a669a2617221
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * Makefile [unixdev]: Uncouple harfbuzz and libpng.
---
 ChangeLog | 4 ++++
 Makefile  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0cda76d..cf8eae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-23  Alexei Podtelezhnikov  <address@hidden>
+
+       * Makefile [unixdev]: Uncouple harfbuzz and libpng.
+
 2018-05-21  Alexei Podtelezhnikov  <address@hidden>
 
        * graph/gblbgra.h: Gamma-corrected variant (disabled).
diff --git a/Makefile b/Makefile
index 3f032f2..afdd1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,8 @@ else
     LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
     ifeq ($(PLATFORM),unixdev)
       LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -lm -lrt -lz 
-lbz2
-      LINK_LIBS += $(shell pkg-config --libs libpng harfbuzz)
+      LINK_LIBS += $(shell pkg-config --libs libpng)
+      LINK_LIBS += $(shell pkg-config --libs harfbuzz)
     else
       LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
     endif



reply via email to

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