[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master a5692c4 2/2: * Jamrules (FT2_LIB), src/Jamfile
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master a5692c4 2/2: * Jamrules (FT2_LIB), src/Jamfile (COMMON_LIB): Don't use $(SUFLIB). |
Date: |
Wed, 18 Apr 2018 03:21:38 -0400 (EDT) |
branch: master
commit a5692c40ba1ab37b7ed3a7557b987daf21381db1
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* Jamrules (FT2_LIB), src/Jamfile (COMMON_LIB): Don't use $(SUFLIB).
Jam automatically uses them.
---
ChangeLog | 6 ++++++
Jamrules | 2 +-
src/Jamfile | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b403085..bb08f61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-18 Werner Lemberg <address@hidden>
+
+ * Jamrules (FT2_LIB), src/Jamfile (COMMON_LIB): Don't use $(SUFLIB).
+
+ Jam automatically uses them.
+
2018-04-17 Werner Lemberg <address@hidden>
Move `obj' directory to `objs'.
diff --git a/Jamrules b/Jamrules
index e273ba0..7515254 100644
--- a/Jamrules
+++ b/Jamrules
@@ -29,7 +29,7 @@ FT2_INCLUDE ?= [ FDirName $(FT2_TOP) include ] ;
# FT2_LIB contains the path to the FreeType 2 library object
#
-FT2_LIB ?= [ FDirName $(FT2_TOP) objs $(LIBPREFIX)freetype$(SUFLIB) ] ;
+FT2_LIB ?= [ FDirName $(FT2_TOP) objs $(LIBPREFIX)freetype ] ;
# X11_LINKLIBS is only used when compiling the X11 graphics back-end
# this should be generated from a "configure" script on Unix
diff --git a/src/Jamfile b/src/Jamfile
index a8ee4ff..da8902d 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -7,7 +7,7 @@ SubDirHdrs $(FT2_INCLUDE) ;
SubDirHdrs [ FT2DEMO_SubDir src ] ;
SubDirHdrs [ FT2DEMO_SubDir graph ] ;
-COMMON_LIB = $(LIBPREFIX)ft2common$(SUFLIB) ;
+COMMON_LIB = $(LIBPREFIX)ft2common ;
Library $(COMMON_LIB) : ftcommon.c common.c ;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master a5692c4 2/2: * Jamrules (FT2_LIB), src/Jamfile (COMMON_LIB): Don't use $(SUFLIB).,
Werner LEMBERG <=