sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- remove Xmu and Xext from linking line for linux2, as they are not needed

Browse Source 
+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled
This commit is contained in:
Nathan Letwory 2006-02-05 11:11:44 +00:00
parent eb185d7032
commit 257124a44f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/linux2-config.py
View 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++

5
tools/Blender.py
View 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'])