Author: titmuss
Date: Fri Apr 25 09:41:53 2008
New Revision: 2367
URL: http://svn.slimdevices.com?rev=2367&root=Jive&view=rev
Log:
Bug: N/A
Description:
Compile fixes for the Controller.
Modified:
7.2/trunk/squeezeos/src/system/Makefile
7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
Modified: 7.2/trunk/squeezeos/src/system/Makefile
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/Makefile?rev=2367&root=Jive&r1=2366&r2=2367&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/Makefile (original)
+++ 7.2/trunk/squeezeos/src/system/Makefile Fri Apr 25 09:41:53 2008
@@ -9,6 +9,7 @@
export CFLAGS=-I${PREFIX}/include -Os
export LDFLAGS=-L${PREFIX}/lib
+export LD_LIBRARY_PATH=${PREFIX}/lib
export DEBUG_CFLAGS=-I${DEBUG_BUILDDIR}/usr/include ${CFLAGS}
export DEBUG_LDFLAGS=-L${DEBUG_BUILDDIR}/usr/lib ${LDFLAGS}
@@ -215,17 +216,17 @@
# alsa-lib
alsa-lib-1.0.9/Makefile:
- cd alsa-lib-1.0.9; ./configure --enable-shared --host=${TARGET}
--target=${TARGET} --program-prefix= --prefix=/usr
+ cd alsa-lib-1.0.9; ./configure --enable-shared --host=${TARGET}
--target=${TARGET} --program-prefix= --prefix=${PREFIX}
alsa-lib: alsa-lib-1.0.9/Makefile
- cd alsa-lib-1.0.9; make; make DESTDIR=${BUILDDIR} install-strip
+ cd alsa-lib-1.0.9; make; make DESTDIR= install-strip
# alsa-utils
alsa-utils-1.0.9/Makefile:
- cd alsa-utils-1.0.9; ./configure --disable-alsamixer --enable-shared
--host=${TARGET} --target=${TARGET} --program-prefix= --prefix=/usr
+ cd alsa-utils-1.0.9; ./configure --disable-alsamixer --enable-shared
--host=${TARGET} --target=${TARGET} --program-prefix= --prefix=${PREFIX}
alsa-utils: alsa-utils-1.0.9/Makefile
- cd alsa-utils-1.0.9; make; make DESTDIR=${BUILDDIR} install-strip
+ cd alsa-utils-1.0.9; make; make DESTDIR= install-strip
# wavplay
wavplay:
Modified: 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS?rev=2367&root=Jive&r1=2366&r2=2367&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS (original)
+++ 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS Fri Apr 25
09:41:53 2008
@@ -100,6 +100,8 @@
fi
echo "Starting jive applications"
+export SDL_NOMOUSE=1
+export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf
if [ -d /mnt/mmc/squeezeplay ]; then
export LUA_PATH=/mnt/mmc/squeezeplay/?.lua
fi
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
