Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-06-04 11:17:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-06-04 11:17:12 +0400
commiteb5f310e058038c3da66935de80661bfc16bf496 (patch)
tree2bad809d8b4047271e836aebeeb3141570d78f84 /config
parent6255105896679c26caafcd61d21540e98aaf33be (diff)
remove cruft from scons config.
Diffstat (limited to 'config')
-rw-r--r--config/aix4-config.py11
-rw-r--r--config/linuxcross-config.py4
2 files changed, 1 insertions, 14 deletions
diff --git a/config/aix4-config.py b/config/aix4-config.py
index 32344cdabc8..a769f53b35e 100644
--- a/config/aix4-config.py
+++ b/config/aix4-config.py
@@ -83,22 +83,11 @@ BF_FTGL_LIB = 'extern_ftgl'
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
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 0f8a15a8c75..0a9b6b3b54c 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -151,9 +151,7 @@ BF_OPENGL = 'C:\\MingW'
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'