# HG changeset patch # User Shinji KONO # Date 1256206203 -32400 # Node ID ccb33e5bcf89c8d2674244e1cf532fb7fe72a6e2 # Parent b05bae01702962663611f29cc08ac5d08fdef4bb direction diff -r b05bae017029 -r ccb33e5bcf89 Renderer/Test/Makefile.macosx --- a/Renderer/Test/Makefile.macosx Thu Oct 22 18:38:07 2009 +0900 +++ b/Renderer/Test/Makefile.macosx Thu Oct 22 19:10:03 2009 +0900 @@ -5,12 +5,12 @@ CFLAGS += `sdl-config --cflags` `xml2-config --cflags` LIBS += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL -.SUFFIXES: .cc .o .xml .xml.h +.SUFFIXES: .cc .o .xml .xml.h .xml.cc .cc.o: $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ -all: ball_bound boss1_action +all: ball_bound boss1_action direction BALL_BOUND_OBJ = ball_bound.o @@ -22,12 +22,23 @@ perl $(TOOL)/create_sglist.pl -o $@ $(BALL_BOUND_XML) BOSS_OBJ = boss1_action.o -BOSS_XML = xml_file/boss1.xml xml_file/player1.xml xml_file/p_shot.xml xml_file/blast.xml -boss1_action : $(BOSS_OBJ) xml_file/boss1.xml.o - $(CC) -o $@ $< xml_file/boss1.xml.o $(LIBS) -boss1_action.cc : xml_file/boss1.xml.h -xml_file/boss1.xml.h xml_file/boss1.xml.cc : $(BOSS_XML) - perl $(TOOL)/create_sglist.pl -o $@ $(BOSS_XML) +BOSS_XMLS = xml_file/boss1.xml xml_file/player1.xml xml_file/p_shot.xml xml_file/blast.xml +BOSS_XML = xml_file/boss1.xml +boss1_action : $(BOSS_OBJ) xml_file/boss1.xml.o + $(CC) -o $@ $< xml_file/boss1.xml.o $(LIBS) +boss1_action.cc : $(BOSS_XML).h +xml_file/boss1.xml.h : $(BOSS_XMLS) + perl $(TOOL)/create_sglist.pl -o $@ $(BOSS_XMLS) + +DIRECTION_OBJ = direction.o +DIRECTION_XML = xml_file/direction.xml +DIRECTION_XMLS = $(DIRECTION_XML) +direction : $(DIRECTION_OBJ) xml_file/direction.xml.o + $(CC) -o $@ $< xml_file/direction.xml.o $(LIBS) +direction.cc : xml_file/direction.xml.h +xml_file/direction.xml.h : $(DIRECTION_XMLS) + perl $(TOOL)/create_sglist.pl -o $@ $(DIRECTION_XMLS) + run: $(TARGET) sudo ./$(TARGET) -width 576 -height 384 -bpp 32 diff -r b05bae017029 -r ccb33e5bcf89 Renderer/Test/direction.cc --- a/Renderer/Test/direction.cc Thu Oct 22 18:38:07 2009 +0900 +++ b/Renderer/Test/direction.cc Thu Oct 22 19:10:03 2009 +0900 @@ -1,5 +1,6 @@ #include "SceneGraphRoot.h" -#include "SGList.h" +#include "direction.h" +#include "xml_file/direction.xml.h" static void x_move(SceneGraphPtr node, int w, int h) @@ -69,7 +70,7 @@ SceneGraphPtr dz; SceneGraphPtr back; - sgroot->createFromXMLfile(manager, "xml_file/direction.xml"); + sgroot->createFromXMLfile("xml_file/direction.xml"); dx = sgroot->createSceneGraph(Dirx); dy = sgroot->createSceneGraph(Diry);