You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2009/07/27 06:17:03 UTC
svn commit: r798020 - in
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native: fontlib/
fontlib/unix/makefile linuxfont/unix/makefile
Author: ndbeyer
Date: Mon Jul 27 04:17:03 2009
New Revision: 798020
URL: http://svn.apache.org/viewvc?rev=798020&view=rev
Log:
update makefiles and ignore for macosx
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/ (props changed)
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 27 04:17:03 2009
@@ -2,4 +2,5 @@
*.map
*.pdb
*.manifest
-libFL.so
+*.so
+*.dylib
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile?rev=798020&r1=798019&r2=798020&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile Mon Jul 27 04:17:03 2009
@@ -37,11 +37,11 @@
endif
MDLLIBFILES += \
- $(LIBPATH)libhypool.a $(LIBPATH)libvmi.so
+ $(LIBPATH)libhypool.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
OSLIBS += $(STDCLIBS)
-DLLNAME=../libFL.so
+DLLNAME=../libFL$(HY_LINKLIB_SUFFIX)
EXPNAME=HYFONTLIB_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?rev=798020&r1=798019&r2=798020&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Mon Jul 27 04:17:03 2009
@@ -21,7 +21,7 @@
INCLUDES += -I/usr/local/include -I/usr/local/include/freetype2
endif
ifeq ($(HY_OS),macosx)
-INCLUDES += -I/sw/lib/freetype2/include/freetype2 -I/sw/lib/freetype2/include
+INCLUDES += -I/opt/local/include/freetype2 -I/opt/local/include/freetype2
endif
BUILDFILES = LinuxNativeFont.o
@@ -31,7 +31,7 @@
endif
MDLLIBFILES += $(LIBPATH)libhypool.a \
- $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) ../../fontlib/libFL.so
+ $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) ../../fontlib/libFL$(HY_LINKLIB_SUFFIX)
OSLIBS += $(XLIBS)