Mercurial > hg > Game > Cerium

changeset 632:1e150f1de013 draft before_simple_task

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sglist is now obsolete.
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 18 Nov 2009 13:38:11 +0900
parents 30dd8a3deb4a (current diff) 9a52258c5ff4 (diff)
children d6f16da6751c
files Renderer/Engine/Makefile.cell Renderer/Engine/Makefile.linux Renderer/Engine/Makefile.macosx
diffstat 5 files changed, 13 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.cell	Wed Nov 18 13:32:58 2009 +0900
+++ b/Renderer/Engine/Makefile.cell	Wed Nov 18 13:38:11 2009 +0900
@@ -28,15 +28,6 @@
 $(TARGET): $(OBJS) $(TASK_OBJS)
 	$(AR) crus $@ $(OBJS) $(TASK_OBJS) 
 
-SGList.o: create_sg_list
-	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cc -o $@
-
-create_sg_list:
-	@if [ ! -f SGList.h ]; then \
-		cd tools/;\
-		./create_sglist.pl ../xml_file/*.xml;\
-	fi
-
 speobject:
 	cd spe; $(MAKE)
 
--- a/Renderer/Engine/Makefile.linux	Wed Nov 18 13:32:58 2009 +0900
+++ b/Renderer/Engine/Makefile.linux	Wed Nov 18 13:38:11 2009 +0900
@@ -1,40 +1,31 @@
 include ./Makefile.def
 
-SRCS_TMP = $(wildcard *.cpp)
+SRCS_TMP = $(wildcard *.cc) $(wildcard Application/*.cc)
 SRCS_EXCLUDE =   # ½ü³°
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
-OBJS = $(SRCS:.cpp=.o)
+OBJS = $(SRCS:.cc=.o)
 
 TASK_DIR  = task
-TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cpp)
-TASK_SRCS_EXCLUDE = span_pack_draw.cpp
+TASK_SRCS_TMP = $(wildcard $(TASK_DIR)/*.cc)
+TASK_SRCS_EXCLUDE = span_pack_draw.cc
 TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
-TASK_OBJS = $(TASK_SRCS:.cpp=.o)
+TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
 LIBS += -lFifoManager
 
 CFLAGS += `sdl-config --cflags` `xml2-config --cflags`
 LIBS   += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs`
 
-.SUFFIXES: .cpp .o
+.SUFFIXES: .cc .o
 
-.cpp.o:
+.cc.o:
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 all: $(TARGET)
 
-$(TARGET): SGList.o $(OBJS) $(TASK_OBJS)
-	$(CC) -o $@ $(OBJS) $(TASK_OBJS) SGList.o $(LIBS)
-
-SGList.o: create_sg_list
-	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cpp -o $@
+$(TARGET): $(OBJS) $(TASK_OBJS)
+	$(AR) crus $@ $(OBJS) $(TASK_OBJS) 
 
-create_sg_list:
-	@if [ ! -f SGList.h ]; then \
-		cd tools/;\
-		./create_sglist.pl ../xml_file/*.xml;\
-		cd ../;\
-	fi
 
 run: $(TARGET)
 	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
@@ -49,4 +40,4 @@
 clean:
 	rm -f $(TARGET) $(OBJS) $(TASK_OBJS)
 	rm -f *~ \#*
-	rm -f SGList.h SGList.cpp
\ No newline at end of file
+	rm -f SGList.h SGList.cpp
--- a/Renderer/Engine/Makefile.macosx	Wed Nov 18 13:32:58 2009 +0900
+++ b/Renderer/Engine/Makefile.macosx	Wed Nov 18 13:38:11 2009 +0900
@@ -26,14 +26,6 @@
 $(TARGET) : $(OBJS) $(TASK_OBJS)
 	$(AR) crus $@ $(OBJS) $(TASK_OBJS) 
 
-# SGList.o: create_sg_list
-# 	$(CC) $(CFLAGS) $(INCLUDE) -c SGList.cc -o $@
-
-create_sg_list:
-	@if [ ! -f SGList.h ]; then \
-		cd tools/;\
-		./create_sglist.pl ../xml_file/*.xml;\
-	fi
 
 
 run: $(TARGET)
--- a/Renderer/Test/Makefile	Wed Nov 18 13:32:58 2009 +0900
+++ b/Renderer/Test/Makefile	Wed Nov 18 13:38:11 2009 +0900
@@ -1,6 +1,8 @@
 
 all:  
 	make -f Makefile.macosx
+linux:  
+	make -f Makefile.linux
 
 cell:
 	make -f Makefile.cell
--- a/Renderer/Test/Makefile.def	Wed Nov 18 13:32:58 2009 +0900
+++ b/Renderer/Test/Makefile.def	Wed Nov 18 13:38:11 2009 +0900
@@ -5,6 +5,6 @@
 CC      = g++
 CFLAGS  = -g -Wall $(ABI)  # -O -DDEBUG
 
-INCLUDE = -I$(CERIUM)/include/TaskManager -I. -I$(CERIUM)/include/Cerium
+INCLUDE = -I$(CERIUM)/include/TaskManager -I$(CERIUM)/Renderer/Engine -I. -I$(CERIUM)/include/Cerium
 LIBS = -L$(CERIUM)/TaskManager -L$(CERIUM)/Renderer/Engine $(ABI)
 TOOL = $(CERIUM)/bin