[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master c524ffe: * Makefile (CC) [unix]: Synchronize wi
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master c524ffe: * Makefile (CC) [unix]: Synchronize with recent change in FreeType. |
Date: |
Thu, 16 Apr 2020 02:30:43 -0400 (EDT) |
branch: master
commit c524ffe99c2543bda632ad33bfae3e8443140f18
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* Makefile (CC) [unix]: Synchronize with recent change in FreeType.
---
ChangeLog | 4 ++++
Makefile | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9127ff2..e926752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-16 Werner Lemberg <address@hidden>
+
+ * Makefile (CC) [unix]: Synchronize with recent change in FreeType.
+
2020-04-15 Alexei Podtelezhnikov <address@hidden>
* Makefile (COMPILE): ... and remove defines.
diff --git a/Makefile b/Makefile
index abe58e5..64de9af 100644
--- a/Makefile
+++ b/Makefile
@@ -166,11 +166,11 @@ else
LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
ifeq ($(PLATFORM),unix)
- CC = $(CCraw)
- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
- --mode=link $(CC) \
- $(subst /,$(COMPILER_SEP),$(LDFLAGS))
- LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
$(LIB_CLOCK_GETTIME)
+ override CC = $(CCraw)
+ LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
+ --mode=link $(CC) \
+ $(subst /,$(COMPILER_SEP),$(LDFLAGS))
+ LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
$(LIB_CLOCK_GETTIME)
else
LINK_CMD = $(CC) $(subst /,$(COMPILER_SEP),$(LDFLAGS))
ifeq ($(PLATFORM),unixdev)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master c524ffe: * Makefile (CC) [unix]: Synchronize with recent change in FreeType.,
Werner LEMBERG <=