Author: titmuss
Date: Fri Apr 25 09:38:28 2008
New Revision: 2366
URL: http://svn.slimdevices.com?rev=2366&root=Jive&view=rev
Log:
Bug: N/A
Description:
Compile fixes for the Controller.
Modified:
7.2/trunk/squeezeplay/src/Makefile.squeezeos
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
7.2/trunk/squeezeplay/src/squeezeplay_jive/src/common.h
Modified: 7.2/trunk/squeezeplay/src/Makefile.squeezeos
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.squeezeos?rev=2366&root=Jive&r1=2365&r2=2366&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.squeezeos (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.squeezeos Fri Apr 25 09:38:28 2008
@@ -139,9 +139,23 @@
#
# squeezeplay
#
-.PHONY: squeezeplay-all squeezeplay squeezeplay_jive freefont fonts-clock
-squeezeplay-all: squeezeplay squeezeplay_jive freefont fonts-clock
-
+.PHONY: squeezeplay-all portaudio flac squeezeplay squeezeplay_jive freefont
fonts-clock
+squeezeplay-all: portaudio flac squeezeplay squeezeplay_jive freefont
fonts-clock
+
+
+# portaudio
+portaudio_v19_1360/Makefile:
+ cd portaudio_v19_1360; ./configure --host=${TARGET} --target=${TARGET}
--prefix=${PREFIX}
+
+portaudio: portaudio_v19_1360/Makefile
+ cd portaudio_v19_1360; make && make install
+
+# flac
+flac-1.2.1/Makefile:
+ cd flac-1.2.1; ./configure --disable-ogg --disable-xmms-plugin
--host=${TARGET} --target=${TARGET} --prefix=${PREFIX}
+
+flac: flac-1.2.1/Makefile
+ cd flac-1.2.1; make && make install
# squeezeplay
squeezeplay/Makefile:
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2366&root=Jive&r1=2365&r2=2366&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am Fri Apr 25 09:38:28 2008
@@ -113,6 +113,7 @@
share/jive/AppletMeta.lua \
share/jive/Iconbar.lua \
share/jive/global_strings.txt \
+ share/jive/app.png \
share/jive/splash.png
jiveuidir = $(pkgdatadir)/jive/ui
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=2366&root=Jive&r1=2365&r2=2366&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in Fri Apr 25 09:38:28 2008
@@ -409,6 +409,7 @@
share/jive/AppletMeta.lua \
share/jive/Iconbar.lua \
share/jive/global_strings.txt \
+ share/jive/app.png \
share/jive/splash.png
jiveuidir = $(pkgdatadir)/jive/ui
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c?rev=2366&root=Jive&r1=2365&r2=2366&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c Fri Apr 25
09:38:28 2008
@@ -232,6 +232,8 @@
// XXXX buffer underrun
}
+
+ return 0;
}
Modified: 7.2/trunk/squeezeplay/src/squeezeplay_jive/src/common.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/src/common.h?rev=2366&root=Jive&r1=2365&r2=2366&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay_jive/src/common.h (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay_jive/src/common.h Fri Apr 25 09:38:28
2008
@@ -4,6 +4,9 @@
** This file is subject to the Logitech Public Source License Version 1.0.
Please see the LICENCE file for details.
*/
+
+#ifndef SQUEEZEPLAY_JIVE_COMMON_H
+#define SQUEEZEPLAY_JIVE_COMMON_H
#include "config.h"
@@ -50,3 +53,10 @@
#include "lua.h"
#include "lauxlib.h"
+/* boolean type */
+typedef unsigned int bool;
+#define true 1
+#define false !true
+
+
+#endif // SQUEEZEPLAY_JIVE_COMMON_H
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
