[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12968] trunk/blender/source/nan_compile. mk: -m64 somehow made opengl headers have conflicting values when compiling .

Campbell Barton ideasman42 at gmail.com
Fri Dec 21 10:30:38 CET 2007


Revision: 12968
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12968
Author:   campbellbarton
Date:     2007-12-21 10:30:37 +0100 (Fri, 21 Dec 2007)

Log Message:
-----------
-m64 somehow made opengl headers have conflicting values when compiling.

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

Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk	2007-12-21 01:53:55 UTC (rev 12967)
+++ trunk/blender/source/nan_compile.mk	2007-12-21 09:30:37 UTC (rev 12968)
@@ -182,10 +182,10 @@
 #    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"
 
-    ifeq ($(findstring 64,$(CPU)), 64)
-        CFLAGS	+= -m64
-        CCFLAGS	+= -m64
-    endif
+#    ifeq ($(findstring 64,$(CPU)), 64)
+#        CFLAGS	+= -m64
+#        CCFLAGS	+= -m64
+#    endif
 
     REL_CFLAGS	+= -O2
     REL_CCFLAGS	+= -O2





More information about the Bf-blender-cvs mailing list