From feba2d3edf25b9c20bdd85d399c8f67123acf680 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 Sep 2014 14:28:50 +0600 Subject: Attempt to fix compilation error on ubuntu linux --- build_files/scons/tools/Blender.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'build_files') 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 -- cgit v1.2.3