# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1291901600 -32400
# Node ID 095e9575cc0ae550ab74f03b1c2e44780326199d
# Parent  bdc882acda58fc1af9ed5e4c81f27c98a4a74338# Parent  47101546f0304cc77be2cf969083a3e75ee324f7
merge

diff -r bdc882acda58 -r 095e9575cc0a Makefile.mac
--- a/Makefile.mac	Thu Dec 09 22:31:06 2010 +0900
+++ b/Makefile.mac	Thu Dec 09 22:33:20 2010 +0900
@@ -1,20 +1,26 @@
 # Makefile to build the SDL tests
+include ./Makefile.def
 
 srcdir  = .
+ABI = -m32
 
-CC      = gcc
-CFLAGS  = -g -m32 -O2 -Wall `sdl-config --cflags`
-LIBS	=  `sdl-config --libs`,-framework,OpenGL -lSDL_mixer
-TARGET = my_dandy
-OBJS    = sgoex.o Enemy.o bom.o tokuten.o atari.o count2.o move.o schedule.o tama.o syokika.o Ss.o sound.o main.o profile.o debug.o trace.o LoadSprite.o #back.o
+CFLAGS  += -g $(ABI) -O2 -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
+LIBS	+=  `sdl-config --libs`,-framework,OpenGL -lSDL_mixer -lSDL_image `xml2-config --libs`
+LIBS += -lCerium -lFifoManager
+
+TARGET = demo dandy
+OBJS    =  Character.o Bom.o tokuten.o collision.o count2.o Character_state.o schedule3.o tama2.o syokika.o Ss.o sound.o  profile.o debug.o trace.o LoadSprite.o xml.o b64_de.o tree_controll.o object.o sys.o 
 
 all: $(TARGET)
 
 test: $(TARGET)
-	./$(TARGET) -test
+	./demo  -test
 
-$(TARGET): $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LIBS)
+demo: $(OBJS) sgoex.o main.o
+	$(CC) $(ABI) -o $@ main.o sgoex.o $(OBJS) $(LIBS)
+
+dandy: $(OBJS) Dandy.o
+	$(CC) $(ABI) -o $@ $(OBJS) Dandy.o $(LIBS)
 
 clean:
 	rm -f $(TARGET) $(OBJS)
@@ -22,4 +28,7 @@
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+
 debug.o:debug.h
diff -r bdc882acda58 -r 095e9575cc0a Makefile.ps3
--- a/Makefile.ps3	Thu Dec 09 22:31:06 2010 +0900
+++ b/Makefile.ps3	Thu Dec 09 22:33:20 2010 +0900
@@ -1,20 +1,27 @@
 # Makefile to build the SDL tests
+include ./Makefile.def
 
 srcdir  = .
+ABI = -m32
 
-CC      = gcc
-CFLAGS  = -g -O2 -Wall `sdl-config --cflags` `xml2-config --cflags`
-LIBS	=  `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_image `xml2-config --libs`
-TARGET = demo
-OBJS    = sankaku.o sgoex.o Character.o Bom.o tokuten.o collision.o count2.o Character_state.o schedule3.o tama2.o syokika.o Ss.o sound.o main.o profile.o debug.o trace.o LoadSprite.o xml.o b64_de.o tree_controll.o object.o sys.o #back.o 
+CFLAGS  += -g $(ABI) -O2 -Wall `/usr/bin/sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
+LIBS	+=  `/usr/bin/sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_image `xml2-config --libs`
+LIBS +=  -lCerium -lCellManager  -lspe2
+
+
+TARGET = demo dandy
+OBJS    =  Character.o Bom.o tokuten.o collision.o count2.o Character_state.o schedule3.o tama2.o syokika.o Ss.o sound.o  profile.o debug.o trace.o LoadSprite.o xml.o b64_de.o tree_controll.o object.o sys.o 
 
 all: $(TARGET)
 
 test: $(TARGET)
-	./$(TARGET) -test
+	./demo  -test
 
-$(TARGET): $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LIBS)
+demo: $(OBJS) sgoex.o main.o
+	$(CC) $(ABI) -o $@ main.o sgoex.o $(OBJS) $(LIBS)
+
+dandy: $(OBJS) Dandy.o
+	$(CC) $(ABI) -o $@ $(OBJS) Dandy.o $(LIBS)
 
 clean:
 	rm -f $(TARGET) $(OBJS)
@@ -22,8 +29,7 @@
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
-debug.o:debug.h
+.cc.o:
+	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
-depend:
-	makedepend -- $(CFLAGS) -- $(OBJS:.o=.c)
-
+debug.o:debug.h
diff -r bdc882acda58 -r 095e9575cc0a sgoex.h
--- a/sgoex.h	Thu Dec 09 22:31:06 2010 +0900
+++ b/sgoex.h	Thu Dec 09 22:33:20 2010 +0900
@@ -101,4 +101,4 @@
 
 void keybord();
 
-#endif SGOEX_H
+#endif // SGOEX_H