[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12958] trunk/blender/source/nan_compile. mk: change default solaris gcc args, use -m64 for 64bit arch, use -O2 rather then -O1

[Campbell Barton]

Revision: 12958
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12958
Author:   campbellbarton
Date:     2007-12-20 17:33:45 +0100 (Thu, 20 Dec 2007)

Log Message:
-----------
change default solaris gcc args, use -m64 for 64bit arch, use -O2 rather then -O1

Modified Paths:
--------------
    trunk/blender/source/nan_compile.mk

Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk	2007-12-20 12:37:15 UTC (rev 12957)
+++ trunk/blender/source/nan_compile.mk	2007-12-20 16:33:45 UTC (rev 12958)
@@ -181,18 +181,25 @@
     CCFLAGS	+= -pipe -fPIC -funsigned-char -fno-strict-aliasing
 #    CFLAGS	+= "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned"
 #    CCFLAGS	+= "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned"
-    REL_CFLAGS	+= -O1
-    REL_CCFLAGS += -O1
+
+    ifeq ($(findstring 64,$(CPU)), 64)
+        CFLAGS	+= -m64
+        CCFLAGS	+= -m64
+    endif
+
+    REL_CFLAGS	+= -O2
+    REL_CCFLAGS	+= -O2
+
     NAN_DEPEND = true
-  #ifeq ($(CPU),sparc)
-   ifeq ($(CPU),$(findstring $(CPU), "sparc"))
-    OPENGL_HEADERS = /usr/openwin/share/include
-    CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
-    JAVA_HEADERS = /usr/java/include
-    JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
-  else
-    OPENGL_HEADERS = $(LCGDIR)/mesa/include
-  endif
+#    ifeq ($(CPU),sparc)
+    ifeq ($(findstring sparc,$(CPU)), sparc)
+        OPENGL_HEADERS = /usr/openwin/share/include
+        CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
+        JAVA_HEADERS = /usr/java/include
+        JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
+    else
+        OPENGL_HEADERS = $(LCGDIR)/mesa/include
+    endif
     AR = ar
     ARFLAGS = ruv
     ARFLAGSQUIET = ru