changeset 904:e622f27c2808

[aquarium] Makefile update
author kazz
date Sat, 17 Jul 2010 15:09:48 +0900
parents 04bf33e8e324
children 5710e5be29d6 348b48db317e 1a5de2a29987
files Renderer/Test/Makefile.cell Renderer/Test/Makefile.def Renderer/Test/Makefile.macosx
diffstat 3 files changed, 17 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/Makefile.cell	Sat Jul 17 01:14:50 2010 +0900
+++ b/Renderer/Test/Makefile.cell	Sat Jul 17 15:09:48 2010 +0900
@@ -6,12 +6,15 @@
 LIBS   += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs` 
 
 
-.SUFFIXES: .cc .o .xml
+.SUFFIXES: .proto .pb.o .pb.cc .cc .o .xml .xml.h .xml.cc
 
 .cc.o:
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-ALL = spe-main ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum dynamic viewer SgRootChange property_test create_task property_universe chain_old property_chain # aquarium
+%.pb.cc: $(PROTODIR)/%.proto
+	$(PROTO) $(PROTOFLAGS) $<
+
+ALL = spe-main ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum dynamic viewer SgRootChange property_test create_task property_universe chain_old property_chain aquarium init_aquarium
 
 all: $(ALL)
 
@@ -101,11 +104,14 @@
 property_chain : $(P_CHAIN_OBJ)
 	$(CC) -o $@ $? $(LIBS)
 
-AQUARIUM_OBJ = aquarium.o
+AQUARIUM_OBJ = aquarium.pb.o aquarium.o
 aquarium : $(AQUARIUM_OBJ)
-	$(CC) -o $@ $? $(LIBS)
+	$(CC) -o $@ $?    $(LIBS) $(PROTOLIBS)
 
-	
+INIT_AQUARIUM_OBJ = aquarium.pb.o init_aquarium.o
+init_aquarium : $(INIT_AQUARIUM_OBJ)
+	$(CC) -o $@ $? $(LIBS) $(PROTOLIBS)
+
 debug: $(TARGET)
 	sudo ppu-gdb ./$(TARGET) 
 
--- a/Renderer/Test/Makefile.def	Sat Jul 17 01:14:50 2010 +0900
+++ b/Renderer/Test/Makefile.def	Sat Jul 17 15:09:48 2010 +0900
@@ -9,3 +9,8 @@
 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
+
+PROTO = protoc
+PROTODIR = ./protobuf
+PROTOFLAGS = -I=$(PROTODIR) --cpp_out=./
+PROTOLIBS = -lprotobuf
--- a/Renderer/Test/Makefile.macosx	Sat Jul 17 01:14:50 2010 +0900
+++ b/Renderer/Test/Makefile.macosx	Sat Jul 17 15:09:48 2010 +0900
@@ -1,17 +1,11 @@
 include ./Makefile.def
 
-PROTO = protoc
-PROTODIR = ./protobuf
-PROTOFLAGS = -I=$(PROTODIR) --cpp_out=./
-PROTOLIBS = -lprotobuf
-
-
 LIBS += -lCerium -lFifoManager 
 
 CFLAGS += `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)  
 LIBS   += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL 
 
-.SUFFIXES: .proto .pb.o .pb.cc .cc .o  .xml .xml.h .xml.cc
+.SUFFIXES: .proto .pb.o .pb.cc .cc .o .xml .xml.h .xml.cc
 
 .cc.o:
 	$(CC) $(CFLAGS)  -c $< -o $@