diff options
Diffstat (limited to 'build_files/scons/tools/Blender.py')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 0ed83d57f9f..8419f9703e0 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -242,6 +242,11 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_STATIC3DMOUSE']: statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC']) + if lenv['WITH_BF_OPENSUBDIV']: + libincs += Split(lenv['BF_OPENSUBDIV_LIBPATH']) + if lenv['WITH_BF_STATICOPENSUBDIV']: + statlibs += Split(lenv['BF_OPENSUBDIV_LIB_STATIC']) + # setting this last so any overriding of manually libs could be handled if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'): # We must remove any previous items defining this path, for same reason stated above! @@ -344,6 +349,13 @@ def setup_syslibs(lenv): if not lenv['WITH_BF_STATICPNG']: syslibs += Split(lenv['BF_PNG_LIB']) + if lenv['WITH_BF_OPENSUBDIV']: + if not lenv['WITH_BF_STATICOPENSUBDIV']: + if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'win64-mingw'): + syslibs += [osdlib+'_d' for osdlib in Split(lenv['BF_OPENSUBDIV_LIB'])] + else: + syslibs += Split(lenv['BF_OPENSUBDIV_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)) |