Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4521:2512ff54e498

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow CFLAGS and LIBS for FreeType to be passed in using FT2_CFLAGS and FT2_LIBS.
author andrew
date Fri, 29 Jul 2011 02:35:52 +0100
parents 78a9ce9d0db8
children 766c048eb152
files make/sun/font/Makefile make/tools/freetypecheck/Makefile
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/font/Makefile	Fri Jul 29 01:39:33 2011 +0100
+++ b/make/sun/font/Makefile	Fri Jul 29 02:35:52 2011 +0100
@@ -128,8 +128,8 @@
   ifeq ($(USING_SYSTEM_FT_LIB), false)
     FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
   endif
-  OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
-endif 
+  OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) $(FT2_LIBS)
+endif
 
 library:: $(FREETYPE_LIB)
 
@@ -161,7 +161,7 @@
 ifndef OPENJDK
   CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
 else
-  CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
+  CPPFLAGS += $(FT2_CFLAGS)
 endif
 
 ifeq ($(PLATFORM), windows)
--- a/make/tools/freetypecheck/Makefile	Fri Jul 29 01:39:33 2011 +0100
+++ b/make/tools/freetypecheck/Makefile	Fri Jul 29 02:35:52 2011 +0100
@@ -50,7 +50,7 @@
   ifeq ($(PLATFORM), solaris)
     FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
   else #linux
-      FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
+      FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) $(FT2_LIBS)
   endif
 endif
 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)