Author: bklaas
Date: Tue Oct 14 11:58:26 2008
New Revision: 3123
URL: http://svn.slimdevices.com?rev=3123&root=Jive&view=rev
Log:
Bug: 9664
Description: move Test and Bounce to squeezeplay_contrib directory
updates to makefiles to support that change
a few tweaks to get Invaders and Snake to work (note: these applets are not
currently installed on any platform, and won't be without some further fixes
)
Added:
7.3/trunk/squeezeplay/src/squeezeplay_contrib/Makefile
- copied unchanged from r2761,
7.3/trunk/squeezeplay/src/squeezeplay_test/Makefile
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/
- copied from r3122,
7.3/trunk/squeezeplay/src/squeezeplay_test/share/applets/Bounce/
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Test/
- copied from r3122,
7.3/trunk/squeezeplay/src/squeezeplay_test/share/applets/Test/
Removed:
7.3/trunk/squeezeplay/src/squeezeplay_test/Makefile
7.3/trunk/squeezeplay/src/squeezeplay_test/share/applets/Bounce/
7.3/trunk/squeezeplay/src/squeezeplay_test/share/applets/Test/
Modified:
7.3/trunk/squeezeplay/src/Makefile.linux
7.3/trunk/squeezeplay/src/Makefile.osx
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Invaders/InvadersApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
Modified: 7.3/trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.linux?rev=3123&root=Jive&r1=3122&r2=3123&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.linux (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.linux Tue Oct 14 11:58:26 2008
@@ -143,8 +143,8 @@
# squeezeplay
#
-.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont freefont-debian
-app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont
+.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont freefont-debian
+app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont
# portaudio
portaudio_v19_1360/Makefile:
@@ -188,8 +188,8 @@
squeezeplay_desktop: squeezeplay_desktop/Makefile
cd squeezeplay_desktop; make install
-squeezeplay_test: squeezeplay/Makefile
- cd squeezeplay_test; make PREFIX=${PREFIX}
+squeezeplay_contrib: squeezeplay/Makefile
+ cd squeezeplay_contrib; make PREFIX=${PREFIX}
# freefont
freefont:
Modified: 7.3/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.osx?rev=3123&root=Jive&r1=3122&r2=3123&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.osx Tue Oct 14 11:58:26 2008
@@ -160,8 +160,8 @@
# squeezeplay
#
-.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont squeezeplay_dmg
-app: portaudio flac libmad tremor libpng libjpeg squeezeplay
squeezeplay_desktop squeezeplay_test freefont squeezeplay_dmg
+.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont squeezeplay_dmg
+app: portaudio flac libmad tremor libpng libjpeg squeezeplay
squeezeplay_desktop squeezeplay_contrib freefont squeezeplay_dmg
# portaudio
portaudio_v19_1360/Makefile:
@@ -222,8 +222,8 @@
squeezeplay_desktop: squeezeplay_desktop/Makefile
cd squeezeplay_desktop; make install
-squeezeplay_test:
- cd squeezeplay_test; make PREFIX=${PREFIX}
+squeezeplay_contrib:
+ cd squeezeplay_contrib; make PREFIX=${PREFIX}
# freefont
freefont:
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Invaders/InvadersApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Invaders/InvadersApplet.lua?rev=3123&root=Jive&r1=3122&r2=3123&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Invaders/InvadersApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Invaders/InvadersApplet.lua
Tue Oct 14 11:58:26 2008
@@ -449,9 +449,9 @@
obj.last_ufo = 0
- obj.missle_snd = Audio:loadSound("applets/Invaders/missile.wav", 0)
- obj.photon_snd = Audio:loadSound("applets/Invaders/photon.wav", 1)
- obj.explosion_snd = Audio:loadSound("applets/Invaders/explosion.wav", 0)
+ obj.missle_snd = Framework:loadSound("applets/Invaders/missile.wav", 0)
+ obj.photon_snd = Framework:loadSound("applets/Invaders/photon.wav", 1)
+ obj.explosion_snd =
Framework:loadSound("applets/Invaders/explosion.wav", 0)
return obj
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua?rev=3123&root=Jive&r1=3122&r2=3123&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
Tue Oct 14 11:58:26 2008
@@ -73,8 +73,8 @@
local SNAKE = 2
local MINLENGTH = 10
-local pointSound = Audio:loadSound("applets/Snake/point.wav", 1)
-local crashSound = Audio:loadSound("applets/Snake/crash.wav", 1)
+local pointSound = Framework:loadSound("applets/Snake/point.wav", 1)
+local crashSound = Framework:loadSound("applets/Snake/crash.wav", 1)
local labelStatus = nil
module(...)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
