Mercurial > hg > Game > Cerium

changeset 1192:6147dd81b4c7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Daichi TOMA <e085740@ie.u-ryukyu.ac.jp>
date Fri, 08 Jul 2011 19:38:09 +0900
parents bd4a27ae2524 (current diff) 5abf0ce8c71c (diff)
children ae3ca6ee94e5
files TaskManager/Makefile.def
diffstat 5 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def	Fri Jul 08 19:37:08 2011 +0900
+++ b/Renderer/Engine/Makefile.def	Fri Jul 08 19:38:09 2011 +0900
@@ -6,8 +6,8 @@
 ABI = -m$(ABIBIT)
 CC      = g++
 
-#OPT	=  -g -DUSE_TASKARRAY -DUSE_PIPELINE -DUSE_SEGMENT 
- OPT	= -O9 -DUSE_TASKARRAY -DUSE_PIPELINE -DUSE_SEGMENT  
+OPT	=  -g -DUSE_TASKARRAY -DUSE_PIPELINE -DUSE_SEGMENT 
+# OPT	= -O9 -DUSE_TASKARRAY -DUSE_PIPELINE -DUSE_SEGMENT  
 
 CFLAGS  = -Wall $(ABI) $(OPT)  #  -DDEBUG
 
--- a/Renderer/Engine/SceneGraph.cc	Fri Jul 08 19:37:08 2011 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Fri Jul 08 19:38:09 2011 +0900
@@ -616,7 +616,7 @@
      * image_name を既に Load していれば何もしない
      */
     int tex_id;
-    if (!texture_hash.hash_regist(filename, tex_id)) {
+    if (texture_hash.sg_hash_regist(filename, tex_id) == -1) {
 
         SDL_Surface *texture_image = load_decode_image(filename, image_name, cur);
 	if (texture_image==0) {
--- a/Renderer/Engine/TextureHash.cc	Fri Jul 08 19:37:08 2011 +0900
+++ b/Renderer/Engine/TextureHash.cc	Fri Jul 08 19:38:09 2011 +0900
@@ -44,7 +44,7 @@
     if (table[hash].tx_id == -1) {
       table[hash].key   = (char*)key;
       id = id_count++;
-      return 0;
+      return -1;
       
     } else if (strcmp(key, table[hash].key) == 0
 	       && table[hash].tx_id != -1){
@@ -64,7 +64,7 @@
         if (table[hash].tx_id == -1) {
             table[hash].key   = (char*)key;
 	    table[hash].tx_id = id;
-            return 0;
+            return -1;
 
         } else if (strcmp(key, table[hash].key) == 0
                    && table[hash].tx_id != -1){
--- a/Renderer/Test/Makefile.def	Fri Jul 08 19:37:08 2011 +0900
+++ b/Renderer/Test/Makefile.def	Fri Jul 08 19:38:09 2011 +0900
@@ -4,8 +4,8 @@
 ABIBIT = 64
 ABI =  -m$(ABIBIT)
 CC      = g++
-#CFLAGS  =  -Wall $(ABI) -g
-CFLAGS  =  -Wall $(ABI) -O9 #-g   # -O -DDEBUG
+CFLAGS  =  -Wall $(ABI) -g
+# CFLAGS  =  -Wall $(ABI) -O9 #-g   # -O -DDEBUG
 
 
 INCLUDE = -I$(CERIUM)/include/TaskManager -I$(CERIUM)/Renderer/Engine -I. -I$(CERIUM)/include/Cerium
--- a/TaskManager/Makefile.def	Fri Jul 08 19:37:08 2011 +0900
+++ b/TaskManager/Makefile.def	Fri Jul 08 19:38:09 2011 +0900
@@ -23,18 +23,14 @@
 IMPL_FIFO_SRCS = $(wildcard $(IMPL_FIFO_DIR)/*.cc)
 IMPL_FIFO_OBJS = $(IMPL_FIFO_SRCS:.cc=.o)
 
-IMPL_PARALLEL_DIR  = Parallel
-IMPL_PARALLEL_SRCS = $(IMPL_FIFO_SRCS) $(wildcard $(IMPL_PARALLEL_DIR)/*.cc)
-IMPL_PARALLEL_OBJS = $(IMPL_PARALLEL_SRCS:.cc=.o)
-
 IMPL_CELL_DIR  = Cell
 IMPL_CELL_SRCS = $(IMPL_FIFO_SRCS) $(wildcard $(IMPL_CELL_DIR)/*.cc)
 IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cc=.o)
 
 ABIBIT = 64
 
-OPT = -g -O0 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE
-#OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE 
+#OPT = -g -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE
+OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE