Mercurial > hg > Members > kono > Cerium
changeset 74:5da437ae84db
*** empty log message ***
| author | gongo |
|---|---|
| date | Mon, 18 Feb 2008 04:05:56 +0900 |
| parents | 811ffebd8deb |
| children | db2b7c565b89 |
| files | TaskManager/Makefile TaskManager/Makefile.cell TaskManager/Makefile.def TaskManager/Test/simple_render/spe/Makefile TaskManager/Test/simple_render/viewer.cpp |
| diffstat | 5 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Makefile Mon Feb 18 03:34:35 2008 +0900 +++ b/TaskManager/Makefile Mon Feb 18 04:05:56 2008 +0900 @@ -26,6 +26,7 @@ cd $(IMPL_CELL_DIR); rm -f *~ \#* rm -f $(KERN_PPE_OBJS) $(KERN_SPE_OBJS) $(KERN_SCHED_OBJS) rm -f $(IMPL_FIFO_OBJS) $(IMPL_CELL_OBJS) + $(MAKE) -f Makefile.cell cellclean tags: $(TAGS) $(TAGSOPTION) \ No newline at end of file
--- a/TaskManager/Makefile.cell Mon Feb 18 03:34:35 2008 +0900 +++ b/TaskManager/Makefile.cell Mon Feb 18 04:05:56 2008 +0900 @@ -1,23 +1,32 @@ include ./Makefile.def +SPETARGET = libspemanager.a + CELL_SPE_DIR = $(IMPL_CELL_DIR)/spe CELL_SPE_SRCS = $(wildcard $(CELL_SPE_DIR)/*.cpp) CELL_SPE_OBJS = $(CELL_SPE_SRCS:.cpp=.o) SPUCC = spu-g++ -SPUCFLAGS = -fno-strict-aliasing + +EXTRA_CFLAGS = -fno-strict-aliasing all: default -default: $(TARGET) spe +default: $(TARGET) $(SPETARGET) PPE_ALL_OBJS = $(KERN_PPE_OBJS) $(KERN_SCHED_OBJS) $(IMPL_CELL_OBJS) $(TARGET): $(PPE_ALL_OBJS) ar crus $@ $(PPE_ALL_OBJS) $(PPE_ALL_OBJS): %.o : %.cpp - $(CC) $(CFLAGS) $(SPUCFLAGS) $(INCLUDE) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ -spe: $(CELL_SPE_OBJS) +$(SPETARGET): $(CELL_SPE_OBJS) + ar crus $@ $(CELL_SPE_OBJS) $(CELL_SPE_OBJS): %.o : %.cpp - $(SPUCC) $(CFLAGS) $(INCLUDE) -c $< -o $@ \ No newline at end of file + $(SPUCC) $(CFLAGS) $(INCLUDE) -c $< -o $@ + +cellclean: + rm -f $(CELL_SPE_OBJS) + cd $(CELL_SPE_DIR); rm -f *~ \#* + rm -f $(SPETARGET) \ No newline at end of file
--- a/TaskManager/Makefile.def Mon Feb 18 03:34:35 2008 +0900 +++ b/TaskManager/Makefile.def Mon Feb 18 04:05:56 2008 +0900 @@ -24,7 +24,7 @@ IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cpp=.o) CC = g++ -CFLAGS = -O9 -Wall -g# -D_PPE_DEBUG -DDEBUG +CFLAGS = -Wall -g -D_PPE_DEBUG# -DDEBUG LIBS = INCLUDE = -I../include/TaskManager \ No newline at end of file
--- a/TaskManager/Test/simple_render/spe/Makefile Mon Feb 18 03:34:35 2008 +0900 +++ b/TaskManager/Test/simple_render/spe/Makefile Mon Feb 18 04:05:56 2008 +0900 @@ -4,7 +4,7 @@ OBJS = $(SRCS:.cpp=.o) CC = spu-g++ -CFLAGS = -g -Wall# -DDEBUG +CFLAGS = #-g -Wall# -DDEBUG INCLUDE = -I../../../../include/TaskManager -I. -I.. LIBS = -L../../.. -lspemanager
--- a/TaskManager/Test/simple_render/viewer.cpp Mon Feb 18 03:34:35 2008 +0900 +++ b/TaskManager/Test/simple_render/viewer.cpp Mon Feb 18 04:05:56 2008 +0900 @@ -32,7 +32,7 @@ exit( 1 ); } -#ifdef _DEBUG +#ifndef _DEBUG screen = SDL_SetVideoMode( width, height, bpp, SDL_HWSURFACE); if (screen == NULL) { fprintf(stderr, "Couldn't set GL mode: %s\n", SDL_GetError()); @@ -299,7 +299,6 @@ graph_line(); fd_update_sgp = manager->open("UpdateSGP"); - fd_update_sgp = 1; fd_create_pp = manager->open("CreatePP"); fd = manager->open("ViewerRunDraw"); task_update_sgp = manager->create_task(fd_update_sgp, @@ -313,7 +312,7 @@ task->set_depend(task_update_sgp); task->set_depend(task_create_pp); - task_update_sgp->set_cpu(CPU_SPE); + //task_update_sgp->set_cpu(CPU_SPE); task_create_pp->set_cpu(CPU_SPE); task_update_sgp->spawn(); @@ -333,7 +332,7 @@ pp_buff->get_buffer(&pp); - //polygon->draw(pp); // test draw of PolygonPack + polygon->draw(pp); // test draw of PolygonPack SDL_BlitSurface(bitmap, NULL, screen, NULL); SDL_UpdateRect(screen, 0, 0, 0, 0);