# HG changeset patch
# User gongo@charles.cr.ie.u-ryukyu.ac.jp
# Date 1226540796 -32400
# Node ID 44e3bf91415509e74bb7b549d8eaaa0cce34e30a
# Parent  9d13524c713633122028e0478ddb07e29c4a2570
fix Makefile

diff -r 9d13524c7136 -r 44e3bf914155 TaskManager/Makefile.def
--- a/TaskManager/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/TaskManager/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -25,7 +25,7 @@
 IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cc=.o)
 
 CC     = g++   
-CFLAGS = -O9 -Wall `sdl-config --cflags` -ffunction-sections -g # -D_PPE_DEBUG #-DDEBUG
+CFLAGS = -O9 -Wall `sdl-config --cflags` -g
 LIBS   = 
 
 INCLUDE = -I../include/TaskManager
\ No newline at end of file
diff -r 9d13524c7136 -r 44e3bf914155 TaskManager/kernel/ppe/TaskManagerImpl.cc
--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc	Thu Nov 13 10:24:16 2008 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc	Thu Nov 13 10:46:36 2008 +0900
@@ -4,7 +4,7 @@
 #include "error.h"
 #include "../sys_task/SysTask.h"
 
-static HTaskPtr systask_start;
+//static HTaskPtr systask_start;
 static HTaskPtr systask_finish;
 
 void
diff -r 9d13524c7136 -r 44e3bf914155 example/HelloWorld/Makefile.def
--- a/example/HelloWorld/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/HelloWorld/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -2,12 +2,10 @@
 
 # include/library path
 # ex: macosx
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
-CERIUM = /Users/gongo/Source/Cerium
+#CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-#CERIUM = /home/gongo/Game_project/Cerium
-
+CERIUM = /home/gongo/Cerium
 
 CC      = g++
 CFLAGS  = -g -Wall -O9
diff -r 9d13524c7136 -r 44e3bf914155 example/HelloWorld/Makefile.ps3
--- a/example/HelloWorld/Makefile.ps3	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/HelloWorld/Makefile.ps3	Thu Nov 13 10:46:36 2008 +0900
@@ -11,7 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-LIBS = -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/HelloWorld/README
--- a/example/HelloWorld/README	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/HelloWorld/README	Thu Nov 13 10:46:36 2008 +0900
@@ -44,4 +44,4 @@
 
 上の例では、Hello タスク 10 個を、
 3 つの CPU に振り分けて実行しているので
-表示が順になっていないことがわかります。
\ No newline at end of file
+表示が順になっていない -> 並列に実行されていることがわかります。
\ No newline at end of file
diff -r 9d13524c7136 -r 44e3bf914155 example/README
--- a/example/README	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/README	Thu Nov 13 10:46:36 2008 +0900
@@ -16,6 +16,31 @@
    ���菴������贋��
 -----------------
 
+2008/11/13
+
+Makefile.macosx ���������������
+`sdl-config --libs` ���菴遵����������������障�����
+箴�蕁����筝���� SDL ���篏帥�������������������������吾�����������������������
+�����ゃ����������眼�� main() ���臀���������������с�����
+
+http://d.hatena.ne.jp/hiratara/20080719/1216481600
+
+筝����荀���������������違�������������������障��������
+SDL ��с����������若�吟����������� main ��� SDL_main ���臀�������������
+libSDL ���筝���� main() ���莎桁�������������潟��������篏帥�ｃ����障�����
+��������с��TaskManager/kernel/main.cc ��с�� #include <SDL.h> ������
+�����ｃ����障����������������������с�������若�九�眼�с�� sdl-config --libs ���������������
+���main() �����������������ｃ����������潟����������若����冴����������с�����
+������������MacOSX �����������馹���с��Linux ��� PS3 筝���с����馹�������������
+Makefile.macosx ���������荐�菴違����������障�����
+
+��������с��MacOSX 筝���т��蕁���������������翫�����筝���� SDL ��������ゃ�潟��������
+莎桁��������膤祉�����篏���������������������障����������∴�����������������������������篁ュ�������������障�������с��
+
+��������������＜�������������������������������������с��������篁������������������������������с��
+
+
+
 2008/11/01
 
 main ��∽�違�������ゃ�������������������障��������
diff -r 9d13524c7136 -r 44e3bf914155 example/basic/Makefile.def
--- a/example/basic/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/basic/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -2,7 +2,13 @@
 
 # include/library path
 # ex: macosx
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
+#CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-CERIUM = /home/gongo/Game_project/Cerium
\ No newline at end of file
+CERIUM = /home/gongo/Cerium
+
+CC      = g++
+CFLAGS  = -g -Wall -O9
+
+INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L${CERIUM}/TaskManager
diff -r 9d13524c7136 -r 44e3bf914155 example/basic/Makefile.linux
--- a/example/basic/Makefile.linux	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/basic/Makefile.linux	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/basic/Makefile.macosx
--- a/example/basic/Makefile.macosx	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/basic/Makefile.macosx	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager `sdl-config --libs`
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/basic/Makefile.ps3
--- a/example/basic/Makefile.ps3	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/basic/Makefile.ps3	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lCellManager -lspe2 -lpthread
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/dependency_task/Makefile.def
--- a/example/dependency_task/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/dependency_task/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -2,7 +2,13 @@
 
 # include/library path
 # ex: macosx
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
+#CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-CERIUM = /home/gongo/Game_project/Cerium
\ No newline at end of file
+CERIUM = /home/gongo/Cerium
+
+CC      = g++
+CFLAGS  = -g -Wall -O9
+
+INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L${CERIUM}/TaskManager
diff -r 9d13524c7136 -r 44e3bf914155 example/dependency_task/Makefile.linux
--- a/example/dependency_task/Makefile.linux	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/dependency_task/Makefile.linux	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/dependency_task/Makefile.macosx
--- a/example/dependency_task/Makefile.macosx	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/dependency_task/Makefile.macosx	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager `sdl-config --libs`
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/dependency_task/Makefile.ps3
--- a/example/dependency_task/Makefile.ps3	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/dependency_task/Makefile.ps3	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lCellManager -lspe2 -lpthread
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/post_function/Makefile.def
--- a/example/post_function/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/post_function/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -2,7 +2,13 @@
 
 # include/library path
 # ex: macosx
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
+#CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-CERIUM = /home/gongo/Game_project/Cerium
\ No newline at end of file
+CERIUM = /home/gongo/Cerium
+
+CC      = g++
+CFLAGS  = -g -Wall -O9
+
+INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L${CERIUM}/TaskManager
diff -r 9d13524c7136 -r 44e3bf914155 example/post_function/Makefile.linux
--- a/example/post_function/Makefile.linux	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/post_function/Makefile.linux	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/post_function/Makefile.macosx
--- a/example/post_function/Makefile.macosx	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/post_function/Makefile.macosx	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager `sdl-config --libs`
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/post_function/Makefile.ps3
--- a/example/post_function/Makefile.ps3	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/post_function/Makefile.ps3	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lCellManager -lspe2 -lpthread
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/share_task/Makefile.def
--- a/example/share_task/Makefile.def	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/share_task/Makefile.def	Thu Nov 13 10:46:36 2008 +0900
@@ -2,8 +2,13 @@
 
 # include/library path
 # ex: macosx
-#CERIUM = /Users/e065737/bin/Game_project/Cerium
-#CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
+#CERIUM = /Users/gongo/Source/Cerium
 
 # ex: linux/ps3
-CERIUM = /home/gongo/Game_project/Cerium
\ No newline at end of file
+CERIUM = /home/gongo/Cerium
+
+CC      = g++
+CFLAGS  = -g -Wall -O9
+
+INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
+LIBS = -L${CERIUM}/TaskManager
diff -r 9d13524c7136 -r 44e3bf914155 example/share_task/Makefile.linux
--- a/example/share_task/Makefile.linux	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/share_task/Makefile.linux	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/share_task/Makefile.macosx
--- a/example/share_task/Makefile.macosx	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/share_task/Makefile.macosx	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lFifoManager
+LIBS += -lFifoManager `sdl-config --libs`
 
 .SUFFIXES: .cc .o
 
diff -r 9d13524c7136 -r 44e3bf914155 example/share_task/Makefile.ps3
--- a/example/share_task/Makefile.ps3	Thu Nov 13 10:24:16 2008 +0900
+++ b/example/share_task/Makefile.ps3	Thu Nov 13 10:46:36 2008 +0900
@@ -11,11 +11,7 @@
 TASK_SRCS = $(filter-out $(TASK_DIR)/$(TASK_SRCS_EXCLUDE),$(TASK_SRCS_TMP))
 TASK_OBJS = $(TASK_SRCS:.cc=.o)
 
-CC      = g++
-CFLAGS  = -g -Wall# -O9 #-DDEBUG
-
-INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
-LIBS = -L${CERIUM}/TaskManager -lCellManager -lspe2 -lpthread
+LIBS += -lCellManager -lspe2 -lpthread -Wl,--gc-sections 
 
 .SUFFIXES: .cc .o