[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29211] trunk/blender/config: remove cruft from scons config.

[Campbell Barton]

Revision: 29211
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29211
Author:   campbellbarton
Date:     2010-06-04 09:17:12 +0200 (Fri, 04 Jun 2010)

Log Message:
-----------
remove cruft from scons config.

Modified Paths:
--------------
    trunk/blender/config/aix4-config.py
    trunk/blender/config/linuxcross-config.py

Modified: trunk/blender/config/aix4-config.py
===================================================================
--- trunk/blender/config/aix4-config.py	2010-06-04 06:02:46 UTC (rev 29210)
+++ trunk/blender/config/aix4-config.py	2010-06-04 07:17:12 UTC (rev 29211)
@@ -83,22 +83,11 @@
 
 WITH_BF_GAMEENGINE='false'
 
-WITH_BF_ODE = 'false'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
-WITH_BF_YAFRAY = 'true'
-
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py	2010-06-04 06:02:46 UTC (rev 29210)
+++ trunk/blender/config/linuxcross-config.py	2010-06-04 07:17:12 UTC (rev 29211)
@@ -151,9 +151,7 @@
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
 
 WITH_BF_OPENMP = True
 BF_OPENMP = LIBDIR + '/gcc/gomp'