Mercurial > hg > Game > Cerium

changeset 281:f05d6c185f55 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changeset:260 repair
author tkaito@localhost.localdomain
date Fri, 05 Jun 2009 11:47:19 +0900
parents c29b7163d6d9
children ef6b225f6f40
files TaskManager/Test/test_render/Makefile TaskManager/Test/test_render/Makefile.cell TaskManager/Test/test_render/Makefile.ps3 TaskManager/Test/test_render/main.cpp
diffstat 4 files changed, 64 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Makefile	Wed Jun 03 20:36:18 2009 +0900
+++ b/TaskManager/Test/test_render/Makefile	Fri Jun 05 11:47:19 2009 +0900
@@ -4,9 +4,9 @@
 	@echo "Make for Mac OS X"
 	@$(MAKE) -f Makefile.macosx
 
-ps3: FORCE
+cell: FORCE
 	@echo "Make for PS3 (Cell)"
-	@$(MAKE) -f Makefile.ps3
+	@$(MAKE) -f Makefile.cell
 
 linux: FORCE
 	@echo "Make for Linux"
@@ -15,8 +15,8 @@
 macosx-depend: FORCE
 	@$(MAKE) -f Makefile.macosx depend
 
-ps3-depend: FORCE
-	@$(MAKE) -f Makefile.ps3 depend
+cell-depend: FORCE
+	@$(MAKE) -f Makefile.cell depend
 
 linux-depend: FORCE
 	@$(MAKE) -f Makefile.linux depend
@@ -25,6 +25,6 @@
 
 clean:
 	@$(MAKE) -f Makefile.macosx clean
-	@$(MAKE) -f Makefile.ps3 clean
+	@$(MAKE) -f Makefile.cell clean
 	@$(MAKE) -f Makefile.linux clean
 	rm -f depend.inc
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TaskManager/Test/test_render/Makefile.cell	Fri Jun 05 11:47:19 2009 +0900
@@ -0,0 +1,58 @@
+include ./Makefile.def
+
+SRCS_TMP = $(wildcard *.cpp)
+SRCS_EXCLUDE =   # ½ü³°
+SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
+OBJS = $(SRCS:.cpp=.o)
+
+TASK_DIR  = task
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cpp)
+TASK_SRCS_EXCLUDE = span_pack_draw.cpp
+TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
+TASK_OBJS = $(TASK_SRCS:.cpp=.o)
+
+LIBS += -lCellManager -lspe2 -lpthread
+
+CFLAGS += `sdl-config --cflags` `xml2-config --cflags`
+LIBS   += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs`
+
+.SUFFIXES: .cpp .o
+
+.cpp.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+default: all
+
+all: $(TARGET) speobject
+
+$(TARGET): SGList.o $(OBJS) $(TASK_OBJS)
+	$(CC) -o $@ SGList.o $(OBJS) $(TASK_OBJS) $(LIBS)
+
+SGList.o: create_sg_list
+	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cpp -o $@
+
+create_sg_list:
+	@if [ ! -f SGList.h ]; then \
+		cd tools/;\
+		./create_sglist.pl ../xml_file/*.xml;\
+	fi
+
+speobject:
+	cd spe; $(MAKE)
+
+run: $(TARGET)
+	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
+
+debug: $(TARGET)
+	sudo ppu-gdb ./$(TARGET) 
+
+depend:
+	$(RM) depend.inc
+	$(CC) -MM -MG $(INCLUDE) $(CFLAGS) $(SRCS) $(TASK_SRCS) > depend.inc
+
+clean:
+	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
+	rm -f *~ \#*
+	rm -f SGList.h SGList.cpp
+	cd task; rm -f *~ \#*
+	cd spe; $(MAKE) clean
--- a/TaskManager/Test/test_render/Makefile.ps3	Wed Jun 03 20:36:18 2009 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-include ./Makefile.def
-
-SRCS_TMP = $(wildcard *.cpp)
-SRCS_EXCLUDE =   # ½ü³°
-SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
-OBJS = $(SRCS:.cpp=.o)
-
-TASK_DIR  = task
-TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cpp)
-TASK_SRCS_EXCLUDE = span_pack_draw.cpp
-TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
-TASK_OBJS = $(TASK_SRCS:.cpp=.o)
-
-LIBS += -lCellManager -lspe2 -lpthread
-
-CFLAGS += `sdl-config --cflags` `xml2-config --cflags`
-LIBS   += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs`
-
-.SUFFIXES: .cpp .o
-
-.cpp.o:
-	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
-
-default: all
-
-all: $(TARGET) speobject
-
-$(TARGET): SGList.o $(OBJS) $(TASK_OBJS)
-	$(CC) -o $@ SGList.o $(OBJS) $(TASK_OBJS) $(LIBS)
-
-SGList.o: create_sg_list
-	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cpp -o $@
-
-create_sg_list:
-	@if [ ! -f SGList.h ]; then \
-		cd tools/;\
-		./create_sglist.pl ../xml_file/*.xml;\
-	fi
-
-speobject:
-	cd spe; $(MAKE)
-
-run: $(TARGET)
-	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
-
-debug: $(TARGET)
-	sudo ppu-gdb ./$(TARGET) 
-
-depend:
-	$(RM) depend.inc
-	$(CC) -MM -MG $(INCLUDE) $(CFLAGS) $(SRCS) $(TASK_SRCS) > depend.inc
-
-clean:
-	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
-	rm -f *~ \#*
-	rm -f SGList.h SGList.cpp
-	cd task; rm -f *~ \#*
-	cd spe; $(MAKE) clean
--- a/TaskManager/Test/test_render/main.cpp	Wed Jun 03 20:36:18 2009 +0900
+++ b/TaskManager/Test/test_render/main.cpp	Fri Jun 05 11:47:19 2009 +0900
@@ -14,7 +14,7 @@
 
 static int sg_number = 0;
 
-static const char *help_str = "Usage: ./test_nogl [OPTION]\n\
+const char *usr_help_str = "Usage: ./test_nogl [OPTION]\n\
   -cpu Number of SPE (default 1)\n\
   -width, -height window size (default 640x480)\n\
   -sg Draw SceneGraph\n\
@@ -56,10 +56,6 @@
 	if (strcmp(argv[i], "-cpu") == 0) {
 	    spenum = atoi(argv[++i]);
 	}
-	if (strcmp(argv[i], "-help") == 0) {
-	    printf("%s\n", help_str);
-	    return -1;
-	}
 	if (strcmp(argv[i], "-video") == 0) {
 	    if (strcmp(argv[i+1], "sdl") == 0) { 
 		vtype = VTYPE_SDL;