[cadcdev-svn-commits] SF.net SVN: cadcdev: [366] kos/examples/dreamcast

[<ba...@us...>]

Revision: 366
          http://svn.sourceforge.net/cadcdev/?rev=366&view=rev
Author:   bardtx
Date:     2006-09-17 17:05:50 -0700 (Sun, 17 Sep 2006)

Log Message:
-----------
kos: Still yet more joy of example fixes

Modified Paths:
--------------
    kos/examples/dreamcast/2ndmix/Makefile
    kos/examples/dreamcast/sound/ghettoplay-vorbis/Makefile
    kos/examples/dreamcast/sound/ghettoplay-vorbis/ghettoplay.c
    kos/examples/dreamcast/sound/ghettoplay-vorbis/songmenu.c
    kos/examples/dreamcast/tsunami/genmenu/Makefile

Modified: kos/examples/dreamcast/2ndmix/Makefile
===================================================================
--- kos/examples/dreamcast/2ndmix/Makefile	2006-09-18 00:05:11 UTC (rev 365)
+++ kos/examples/dreamcast/2ndmix/Makefile	2006-09-18 00:05:50 UTC (rev 366)
@@ -20,7 +20,7 @@
 	rm -f romdisk.img
 
 2ndmix.elf: $(OBJS)
-	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o 2ndmix.elf $(KOS_START) $(OBJS) $(KOS_LIBS)
+	kos-cc -o 2ndmix.elf $(OBJS)
 
 run: 2ndmix.elf
 	$(KOS_LOADER) 2ndmix.elf

Modified: kos/examples/dreamcast/sound/ghettoplay-vorbis/Makefile
===================================================================
--- kos/examples/dreamcast/sound/ghettoplay-vorbis/Makefile	2006-09-18 00:05:11 UTC (rev 365)
+++ kos/examples/dreamcast/sound/ghettoplay-vorbis/Makefile	2006-09-18 00:05:50 UTC (rev 366)
@@ -11,8 +11,7 @@
 	-rm -f $(OBJS)
 	
 $(TARGET): $(OBJS)
-	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET) $(KOS_START) \
-		$(OBJS) $(DATAOBJS) $(OBJEXTRA) -loggvorbisplay -lm $(KOS_LIBS)
+	kos-cc -o $(TARGET) $(OBJS) -loggvorbisplay -lm
 
 romdisk.img:
 	$(KOS_GENROMFS) -f romdisk.img -d romdisk -v

Modified: kos/examples/dreamcast/sound/ghettoplay-vorbis/ghettoplay.c
===================================================================
--- kos/examples/dreamcast/sound/ghettoplay-vorbis/ghettoplay.c	2006-09-18 00:05:11 UTC (rev 365)
+++ kos/examples/dreamcast/sound/ghettoplay-vorbis/ghettoplay.c	2006-09-18 00:05:50 UTC (rev 366)
@@ -113,6 +113,7 @@
 	pvr_init_defaults();
 
 	/* Initialize oggvorbis player thread */
+	snd_stream_init();
 	sndoggvorbis_init();
 
 	/* Setup the mouse/font texture */

Modified: kos/examples/dreamcast/sound/ghettoplay-vorbis/songmenu.c
===================================================================
--- kos/examples/dreamcast/sound/ghettoplay-vorbis/songmenu.c	2006-09-18 00:05:11 UTC (rev 365)
+++ kos/examples/dreamcast/sound/ghettoplay-vorbis/songmenu.c	2006-09-18 00:05:50 UTC (rev 366)
@@ -52,7 +52,7 @@
 static int curpos = 0;
 static int filtinitted = 0;
 
-static void snd_hook(void * obj, int freq, int chn, void ** buf, int *req) {
+static void snd_hook(int strm, void * obj, int freq, int chn, void ** buf, int *req) {
 	int actual;
 	uint64 t;
 
@@ -395,7 +395,7 @@
 		hookmut = mutex_create();
 	}
 	if (!filtinitted) {
-		snd_stream_filter_add(snd_hook, NULL);
+		snd_stream_filter_add(0, snd_hook, NULL);
 		filtinitted = 1;
 	}
 

Modified: kos/examples/dreamcast/tsunami/genmenu/Makefile
===================================================================
--- kos/examples/dreamcast/tsunami/genmenu/Makefile	2006-09-18 00:05:11 UTC (rev 365)
+++ kos/examples/dreamcast/tsunami/genmenu/Makefile	2006-09-18 00:05:50 UTC (rev 366)
@@ -17,8 +17,7 @@
 	-rm -f $(TARGET) romdisk.*
 
 $(TARGET): $(OBJS) romdisk.o
-	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET) $(KOS_START) \
-		$(OBJS) romdisk.o $(OBJEXTRA) -ltsunami -lk++ -lparallax -lpng -ljpeg -lkmg -lz -lkosutils -lm $(KOS_LIBS)
+	kos-c++ -o $(TARGET) $(OBJS) romdisk.o -ltsunami -lparallax -lpng -ljpeg -lkmg -lz -lkosutils -lm
 
 romdisk.img:
 	$(KOS_GENROMFS) -f romdisk.img -d romdisk -v


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.