Mercurial > hg > Game > Cerium

diff example/many_task/Makefile.def @ 291:d7803cea25a3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
document
author kono@localhost.localdomain
date Fri, 05 Jun 2009 18:16:31 +0900
parents 2c775d229cc6
children 68d4267cb4a4
line wrap: on
line diff
--- a/example/many_task/Makefile.def	Fri Jun 05 18:05:46 2009 +0900
+++ b/example/many_task/Makefile.def	Fri Jun 05 18:16:31 2009 +0900
@@ -1,9 +1,13 @@
 TARGET = sort
 
 # include/library path
-# ex: macosx
+# ex  macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
 
+<<<<<<< /home/teacher/kono/src/Cerium/example/many_task/Makefile.def
+# ex  linux/ps3
+CERIUM = ../../../Cerium
+=======
 # ex: linux/ps3
 CERIUM = ../../../Cerium
 
@@ -12,3 +16,4 @@
 
 INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
 LIBS = -L${CERIUM}/TaskManager
+>>>>>>> /tmp/Makefile.def~other.2eIJvO