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

Make scons pick up default link flags from previous commit on linux platforms;

Browse Source 
statically-linked python releases won't work otherwise.  Bugfixes for #4676
and #4486.
This commit is contained in:
Ken Hughes 2006-07-14 04:13:55 +00:00
parent 6a72f9f61d
commit 9cc25e5a15
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/linux2-config.py
View File

@ -4,6 +4,7 @@ BF_PYTHON_VERSION = '2.4'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
WITH_BF_OPENAL = 'true'
BF_OPENAL = '/usr'
@ -147,8 +148,6 @@ BF_DEBUG_FLAGS = ''
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
#Python linking
PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
#Link against pthread
PLATFORM_LINKFLAGS = ['-pthread']

3
tools/Blender.py
View File

@ -377,6 +377,9 @@ class BlenderEnvironment(SConsEnvironment):
lenv = self.Copy()
if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']:
lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS']))
if lenv['OURPLATFORM']=='linux2':
lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
if lenv['OURPLATFORM']=='darwin':
lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])