diff options
| author | Ken Hughes <khughes@pacific.edu> | 2006-07-14 08:13:55 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2006-07-14 08:13:55 +0400 |
| commit | 9cc25e5a150c49f77dc6ad9503ca89ff3c6dfd67 (patch) | |
| tree | 1a5f2e296e9ff546f5666c7c1bfbe36d2141835d | |
| parent | 6a72f9f61dd4a9c5881388623e26a06f4c74efab (diff) | |
Make scons pick up default link flags from previous commit on linux platforms;
statically-linked python releases won't work otherwise. Bugfixes for #4676
and #4486.
| -rw-r--r-- | config/linux2-config.py | 3 | ||||
| -rw-r--r-- | tools/Blender.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index 9cff1e13f47..0b6deab2c8d 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -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'] diff --git a/tools/Blender.py b/tools/Blender.py index a5a0101d486..203635e14f6 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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']) |