From: Jonathan <scr...@us...> - 2010-10-22 20:49:34
|
Update of /cvsroot/hgengine/Mercury In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7570 Modified Files: base_set.sh Log Message: Added support for darwin 10.0 Index: base_set.sh =================================================================== RCS file: /cvsroot/hgengine/Mercury/base_set.sh,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** base_set.sh 8 Feb 2009 20:32:00 -0000 1.30 --- base_set.sh 22 Oct 2010 20:49:26 -0000 1.31 *************** *** 11,14 **** --- 11,17 ---- if test $OSTYPE = "darwin9.0"; then ISMAC=1; fi + if test $OSTYPE = "darwin10.0"; then + ISMAC=1; fi + if test `uname -m` = "x86_64"; then *************** *** 194,198 **** if test $ISMAC = 1; then ! CC_BASE="$CC_BASE -I"/System/Library/Frameworks/OpenGL.framework/Headers" -Isrc -I/usr/X11R6/include -I. -Isrc/ode -Iode -Isrc/png -Ipng -I/usr/X11/include" ! LD_BASE="$LD_BASE -Lsrc/maclib -framework OpenGL -lobjc -framework GLUT -framework ApplicationServices" fi --- 197,201 ---- if test $ISMAC = 1; then ! CC_BASE="$CC_BASE -m32 -I"/System/Library/Frameworks/OpenGL.framework/Headers" -Isrc -I/usr/X11R6/include -I. -Isrc/ode -Iode -Isrc/png -Ipng -I/usr/X11/include" ! LD_BASE="$LD_BASE -m32 -Lsrc/maclib -framework OpenGL -lobjc -framework GLUT -framework ApplicationServices" fi |