[Hgengine-cvs] SF.net SVN: hgengine:[549] Mercury2

[<cn...@us...>]

Revision: 549
          http://hgengine.svn.sourceforge.net/hgengine/?rev=549&view=rev
Author:   cnlohr
Date:     2009-10-02 06:49:36 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
1) disable SSE by default since SSE produces broken code as of now.
2) actually allow for enabling of the GL_PROFILE ing of the code.

Modified Paths:
--------------
    Mercury2/base_set.sh
    Mercury2/modules/Makefile

Modified: Mercury2/base_set.sh
===================================================================
--- Mercury2/base_set.sh	2009-10-02 06:48:51 UTC (rev 548)
+++ Mercury2/base_set.sh	2009-10-02 06:49:36 UTC (rev 549)
@@ -8,12 +8,13 @@
 	ISMAC=1; fi
 
 
-OPTIONS="X11 libxml OGL sse gprof"
+OPTIONS="X11 libxml OGL sse gprof glprofile"
 OPT_X11=1
 OPT_OGL=1
 OPT_libxml=1
-OPT_sse=1
+OPT_sse=0
 OPT_gprof=0
+OPT_glprofile=0
 
 DEFINES="WAS_CONFIGURED USE_MSTRING"
 CC_BASE="-O2 -g0 -Wall"
@@ -44,9 +45,11 @@
 
 NEED_H="stdio.h stdlib.h"
 WANT_H="time.h"
+CC_BASE="$CC_BASE -I."
 
 NEED_L="m c z pthread png pthread";
 
+
 if test $OPT_libxml = 1; then
 	CC_BASE="$CC_BASE -I/usr/include/libxml2"
 	NEED_H="$NEED_H libxml/parser.h"
@@ -67,6 +70,10 @@
 	LD_BASE="$LD_BASE -pg"
 fi
 
+if test $OPT_glprofile = 1; then
+	DEFINES="$DEFINES GL_PROFILE"
+fi
+
 if test $OPT_OGL = 1; then
 	NEED_H="GL/gl.h"
 	NEED_L="$NEED_L GL GLU"
@@ -84,5 +91,9 @@
 ARCH=`uname -m`
 
 if test $ARCH = "i686" || test $ARCH = "i586"; then
-	CC_BASE="$CC_BASE -march=pentium"
+	if test $OPT_sse = 1; then
+		CC_BASE="$CC_BASE -march=pentium3"
+	else
+		CC_BASE="$CC_BASE -march=pentium"
+	fi
 fi

Modified: Mercury2/modules/Makefile
===================================================================
--- Mercury2/modules/Makefile	2009-10-02 06:48:51 UTC (rev 548)
+++ Mercury2/modules/Makefile	2009-10-02 06:49:36 UTC (rev 549)
@@ -1,4 +1,4 @@
-CFLAGS=-O2 -g0 -Wall -I/usr/include/libxml2  -DHAVE_CONFIG -DHGENGINE -fno-exceptions -fPIC -I../src -g 
+CFLAGS=-O2 -g0 -Wall -I/usr/include/libxml2 -I.. -msse2 -DHAVE_CONFIG -DHGENGINE -fno-exceptions -fPIC -I../src -g 
 CXXFLAGS=${CFLAGS}
 LDFLAGS=-shared
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.