- remove Xmu and Xext from linking line for linux2, as they are not needed
authorNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 11:11:44 +0000 (11:11 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 11:11:44 +0000 (11:11 +0000)
+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled

config/linux2-config.py
tools/Blender.py

index 69ef71c4371de151f37babff449b84cd68fc2d0b..0cd7113ad7f40eacfdc5e60ba361a183c1570447 100644 (file)
@@ -101,9 +101,9 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 WITH_BF_OPENGL = 'true'
 BF_OPENGL = '/usr/X11R6'
 BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU Xmu Xext X11 Xi'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-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 ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a'
 ##
 ##CC = gcc
 ##CCC = g++
index 060d04a09bcf29ed3e9177ecaf9cdd2e9a002aec..e3d4740d0e5671c5f8310a7096e4e4f10afd1382 100644 (file)
@@ -137,11 +137,12 @@ def setup_syslibs(lenv):
         lenv['BF_GETTEXT_LIB']
         ]
     if lenv['WITH_BF_OPENAL']:
-       lenv['BF_OPENAL_LIB'],
+       syslibs += Split(lenv['BF_OPENAL_LIB'])
     if lenv['OURPLATFORM']=='win32vc':
             syslibs += Split(lenv['BF_ICONV_LIB'])
     syslibs += Split(lenv['BF_TIFF_LIB'])
-    syslibs += Split(lenv['BF_OPENEXR_LIB'])
+    if lenv['WITH_BF_OPENEXR']:
+        syslibs += Split(lenv['BF_OPENEXR_LIB'])
     syslibs += Split(lenv['BF_SDL_LIB'])
     syslibs += Split(lenv['BF_OPENGL_LIB'])
     syslibs += Split(lenv['LLIBS'])