# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1292291306 -32400
# Node ID 6a8cb917e0ad563822727ad8ab58a3808ccd0b3d
# Parent  6754fbb63ac770cc5a8804fac2b30abb3df93e91# Parent  dc3b1d4fe835995221e6e8bc0ca6c4a16a03805f
merge

diff -r 6754fbb63ac7 -r 6a8cb917e0ad Makefile
--- a/Makefile	Tue Dec 14 10:45:02 2010 +0900
+++ b/Makefile	Tue Dec 14 10:48:26 2010 +0900
@@ -4,7 +4,7 @@
 srcdir  = .
 ABI = -m$(ABIBIT)
 
-CFLAGS  += -g $(ABI) -O2 -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
+CFLAGS  += -g $(ABI) -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
 LIBS	+=  `sdl-config --libs`,-framework,OpenGL -lSDL_mixer -lSDL_image `xml2-config --libs`
 LIBS += -lCerium -lFifoManager
 
@@ -23,7 +23,7 @@
 	$(CC) $(ABI) -o $@ $(OBJS) Dandy.o $(LIBS)
 
 clean:
-	rm -f $(TARGET) $(OBJS)
+	rm -f $(TARGET) $(OBJS) main.o sgoex.o
 
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
diff -r 6754fbb63ac7 -r 6a8cb917e0ad sgoex.c
diff -r 6754fbb63ac7 -r 6a8cb917e0ad sound.c
--- a/sound.c	Tue Dec 14 10:45:02 2010 +0900
+++ b/sound.c	Tue Dec 14 10:48:26 2010 +0900
@@ -18,9 +18,9 @@
 #if 0
 static char buf0[] = "pBAV";
 
-int vh_addr[10] =
-{ (int) buf0, (int) buf0, (int) buf0, (int) buf0, (int) buf0,
-  (int) buf0 };
+long vh_addr[10] =
+{ (long) buf0, (long) buf0, (long) buf0, (long) buf0, (long) buf0,
+  (long) buf0 };
 #endif
 
 int vb_addr[10] =