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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-09-08 12:28:50 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-09-08 12:29:34 +0400
commitfeba2d3edf25b9c20bdd85d399c8f67123acf680 (patch)
tree43ce589ff0015465e13474ccde3beb84ba72cdb8 /build_files
parent5850ee0a6a99adc0e5d1db04314732ac3998e318 (diff)
Attempt to fix compilation error on ubuntu linux
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/scons/tools/Blender.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index dcbf7e510e5..b5853b22455 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -248,6 +248,11 @@ def setup_staticlibs(lenv):
libincs = [e for e in libincs if SCons.Subst.scons_subst(e, lenv, gvars=lenv.Dictionary()) != "/usr/lib"]
libincs.append('/usr/lib')
+ # Hack to pass OSD libraries to linker before extern_{clew,cuew}
+ # Here we only store library path, actual library name will be added in setup_syslibs()
+ for syslib in create_blender_liblist(lenv, 'system'):
+ libincs.append(os.path.dirname(syslib))
+
return statlibs, libincs
def setup_syslibs(lenv):
@@ -339,6 +344,10 @@ def setup_syslibs(lenv):
if not lenv['WITH_BF_STATICPNG']:
syslibs += Split(lenv['BF_PNG_LIB'])
+ # Hack to pass OSD libraries to linker before extern_{clew,cuew}
+ for syslib in create_blender_liblist(lenv, 'system'):
+ syslibs.append(os.path.basename(syslib))
+
syslibs += lenv['LLIBS']
return syslibs