Author: tom
Date: Fri Dec 12 08:58:00 2008
New Revision: 3522
URL: http://svn.slimdevices.com?rev=3522&root=Jive&view=rev
Log:
fontconfig path hardcode
Modified:
7.4/branches/pango/squeezeplay/src/Makefile.osx
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/Makefile.osx?rev=3522&root=Jive&r1=3521&r2=3522&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.osx (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.osx Fri Dec 12 08:58:00 2008
@@ -49,7 +49,7 @@
export PREFIX=${BUILD_TOP}
export CFLAGS= -I${PREFIX}/include -I${PREFIX}/include/SDL
-I${PREFIX}/include/pango-1.0 \
- -I${PREFIX}/include -I${PREFIX}/include/glib-2.0
-I${PREFIX}/lib/glib-2.0/include -I${PREFIX}/include/cairo -g
+ -I${PREFIX}/include -I${PREFIX}/include/glib-2.0
-I${PREFIX}/lib/glib-2.0/include -I${PREFIX}/include/cairo -g
export LDFLAGS=-L${PREFIX}/lib -L/usr/lib
export TOOLPATH = $(shell dirname `which gcc`)
@@ -151,17 +151,23 @@
glib2: glib-2.16.4/Makefile
cd glib-2.16.4; make && make install
+#hardcoding temp system-singleton locations for now to tmp until we resolve a
location/alternative
#fontconfig
fontconfig-2.6.0/Makefile:
cd fontconfig-2.6.0; ./configure --enable-shared \
- --with-add-fonts=../share/jive/fonts/ \
+ --with-add-fonts=/tmp/splocal/fonts/ \
--sysconfdir=/tmp/splocal/etc \
--localstatedir=/tmp/splocal/var \
--prefix=${PREFIX}
+# relative dir works, but is relative to app working directory
+# --with-add-fonts=../share/jive/fonts/ \
+
#
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts
\
fontconfig: fontconfig-2.6.0/Makefile
+ -mkdir -p /tmp/splocal/fonts/
+ cp freefont-20060126/Free*ttf /tmp/splocal/fonts/
cd fontconfig-2.6.0; make && make install
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins