Mercurial > hg > Game > Cerium

changeset 652:aefb5ee6fcd0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix on Mac OS X
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Tue, 24 Nov 2009 16:27:39 +0900
parents e78f70dc7ef8
children 586c46994473 2eeb5f267264
files Renderer/Test/send_linda.cc TaskManager/kernel/ppe/MailManager.cc example/HelloWorld/Makefile.def example/MemList/Makefile.def example/MemList/Makefile.macosx
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/send_linda.cc	Mon Nov 23 10:01:02 2009 +0900
+++ b/Renderer/Test/send_linda.cc	Tue Nov 24 16:27:39 2009 +0900
@@ -144,7 +144,7 @@
 }
 
 static char *xml;
-static char *linda = HOSTNAME;
+static const char *linda = HOSTNAME;
 
 MainLoopPtr 
 send_linda::init(Viewer *sgr, int screen_w, int screen_h)
--- a/TaskManager/kernel/ppe/MailManager.cc	Mon Nov 23 10:01:02 2009 +0900
+++ b/TaskManager/kernel/ppe/MailManager.cc	Tue Nov 24 16:27:39 2009 +0900
@@ -46,7 +46,7 @@
     queue[write++] = data;
     write &= mask;
     if (write==read) {
-	externd();
+	extend();
     }
 }
 
--- a/example/HelloWorld/Makefile.def	Mon Nov 23 10:01:02 2009 +0900
+++ b/example/HelloWorld/Makefile.def	Tue Nov 24 16:27:39 2009 +0900
@@ -7,7 +7,7 @@
 # ex  linux/ps3
 CERIUM = ../../../Cerium
 
-CC      = g++ # -m64
+CC      = g++ -m32
 CFLAGS  = -g -Wall -O9
 
 INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
--- a/example/MemList/Makefile.def	Mon Nov 23 10:01:02 2009 +0900
+++ b/example/MemList/Makefile.def	Tue Nov 24 16:27:39 2009 +0900
@@ -5,9 +5,10 @@
 
 # ex: linux/ps3
 CERIUM = ../../../Cerium
+ABIBIT=32
 
-CC      = g++
-CFLAGS  = -g -Wall -O9
+CC      = g++ -m$(ABIBIT)
+CFLAGS  = -g -Wall -O9 
 
 INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
 LIBS = -L${CERIUM}/TaskManager
--- a/example/MemList/Makefile.macosx	Mon Nov 23 10:01:02 2009 +0900
+++ b/example/MemList/Makefile.macosx	Tue Nov 24 16:27:39 2009 +0900
@@ -1,6 +1,5 @@
 include ./Makefile.def
 
-CC += -m64
 SRCS_TMP = $(wildcard *.cc)
 SRCS_EXCLUDE = 
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))