Mercurial > hg > Members > kono > Cerium
changeset 118:e2b1c795525e
fix Makefile
| author | gongo@charles.cr.ie.u-ryukyu.ac.jp |
|---|---|
| date | Thu, 13 Nov 2008 11:08:06 +0900 |
| parents | b7eceea91c76 |
| children | 80ec6b35856c |
| files | TaskManager/Test/test_render/Makefile.def TaskManager/Test/test_render/Makefile.linux TaskManager/Test/test_render/Makefile.macosx TaskManager/Test/test_render/Makefile.ps3 TaskManager/Test/test_render/Tapestry.h |
| diffstat | 5 files changed, 26 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Makefile.def Thu Nov 13 10:56:35 2008 +0900 +++ b/TaskManager/Test/test_render/Makefile.def Thu Nov 13 11:08:06 2008 +0900 @@ -6,6 +6,12 @@ CERIUM = /Users/gongo/Source/Cerium # ex: linux/ps3 -#CERIUM = /home/gongo/Game_project/Cerium +CERIUM = /home/gongo/Cerium + +#CERIUM = ../../.. -#CERIUM = ../../.. \ No newline at end of file +CC = g++ +CFLAGS = -O9 -g -Wall# -DDEBUG + +INCLUDE = -I$(CERIUM)/include/TaskManager -I. +LIBS = -L$(CERIUM)/TaskManager
--- a/TaskManager/Test/test_render/Makefile.linux Thu Nov 13 10:56:35 2008 +0900 +++ b/TaskManager/Test/test_render/Makefile.linux Thu Nov 13 11:08:06 2008 +0900 @@ -11,27 +11,20 @@ TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) TASK_OBJS = $(TASK_SRCS:.cpp=.o) -CC = g++ -CFLAGS = -O0 -g -Wall# -DDEBUG -INCLUDE = -I$(CERIUM)/include/TaskManager -I. -LIBS = -L$(CERIUM)/TaskManager -lFifoManager +LIBS += -lFifoManager -EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags` -EXTRA_LIBS = `sdl-config --libs` -lSDL_image -lGL \ - `xml2-config --libs` +CFLAGS += `sdl-config --cflags` `xml2-config --cflags` +LIBS += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs` .SUFFIXES: .cpp .o .cpp.o: - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ all: $(TARGET) $(TARGET): $(OBJS) $(TASK_OBJS) - $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) - -link: - $(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) + $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) run: $(TARGET) sudo ./$(TARGET) -width 576 -height 384 -bpp 32
--- a/TaskManager/Test/test_render/Makefile.macosx Thu Nov 13 10:56:35 2008 +0900 +++ b/TaskManager/Test/test_render/Makefile.macosx Thu Nov 13 11:08:06 2008 +0900 @@ -11,28 +11,21 @@ TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) TASK_OBJS = $(TASK_SRCS:.cpp=.o) -CC = g++ -CFLAGS = -g -Wall # -DDEBUG -INCLUDE = -I$(CERIUM)/include/TaskManager -I. -LIBS = -L$(CERIUM)/TaskManager -lFifoManager +LIBS += -lFifoManager -EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags` -EXTRA_LIBS = `sdl-config --libs` `xml2-config --libs` \ - -lSDL_image -Wl,-framework,OpenGL +CFLAGS += `sdl-config --cflags` `xml2-config --cflags` +LIBS += `sdl-config --libs` `xml2-config --libs` -lSDL_image -Wl,-framework,OpenGL .SUFFIXES: .cpp .o .cpp.o: - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ all: $(TARGET) $(TARGET): $(OBJS) $(TASK_OBJS) - $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) - -link: - $(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) + $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) run: $(TARGET) sudo ./$(TARGET) -width 576 -height 384 -bpp 32
--- a/TaskManager/Test/test_render/Makefile.ps3 Thu Nov 13 10:56:35 2008 +0900 +++ b/TaskManager/Test/test_render/Makefile.ps3 Thu Nov 13 11:08:06 2008 +0900 @@ -11,31 +11,24 @@ TASK_SRCS = $(filter-out $(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP)) TASK_OBJS = $(TASK_SRCS:.cpp=.o) -CC = g++ -CFLAGS = -O9 -g -Wall# -DDEBUG -INCLUDE = -I$(CERIUM)/include/TaskManager -I. -LIBS = -L$(CERIUM)/TaskManager -lCellManager -lspe2 -lpthread +LIBS += -lCellManager -lspe2 -lpthread -EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags` -EXTRA_LIBS = `sdl-config --libs` -lSDL_image -lGL \ - `xml2-config --libs` +CFLAGS += `sdl-config --cflags` `xml2-config --cflags` +LIBS += `sdl-config --libs` -lSDL_image -lGL `xml2-config --libs` .SUFFIXES: .cpp .o .cpp.o: - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ all: $(TARGET) speobject $(TARGET): $(OBJS) $(TASK_OBJS) - $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) + $(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS) speobject: cd spe; $(MAKE) -link: - $(CC) -o $(TARGET) $(OBJS) $(TASK_OBJS) $(LIBS) $(EXTRA_LIBS) - run: $(TARGET) sudo ./$(TARGET) -width 576 -height 384 -bpp 32 @@ -43,8 +36,7 @@ sudo ppu-gdb ./$(TARGET) depend: - makedepend -- $(CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -- \ - $(SRCS) $(TASK_SRCS) + makedepend -- $(CFLAGS) $(LIBS) $(INCLUDE) -- $(SRCS) $(TASK_SRCS) clean: rm -f $(TARGET) $(OBJS) $(TASK_OBJS)