[Bf-blender-cvs] [c334b28] alembic_pointcache: Fix scons linking of Alembic and HDF5 and additiona Ilmbase/OpenEXR libraries.

[Lukas Tönne]

Commit: c334b2862de7d4ec0490c6df298bda3230aff691
Author: Lukas Tönne
Date:   Tue Nov 4 11:16:10 2014 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBc334b2862de7d4ec0490c6df298bda3230aff691

Fix scons linking of Alembic and HDF5 and additiona Ilmbase/OpenEXR libraries.

===================================================================

M	build_files/scons/config/linux-config.py
M	build_files/scons/tools/Blender.py

===================================================================

diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 8cbf3ec..e80bcf6 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -52,9 +52,9 @@ BF_OPENEXR = '/usr'
 # BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
 
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB = 'Half IlmImf-2_1 Iex-2_1 Imath-2_1 '
 BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 
 WITH_BF_DDS = True
@@ -229,14 +229,13 @@ WITH_BF_FREESTYLE = True
 # HDF5
 WITH_BF_HDF5 = True
 BF_HDF5 = '/usr'
-BF_HDF5_LIB = 'hdf5 hdf5_hl ${BF_OPENEXR}/lib/libHalf.a'
+BF_HDF5_LIB = 'hdf5 hdf5_hl'
 BF_HDF5_LIBPATH='${BF_HDF5}/lib'
 
 # Alembic
 WITH_BF_ALEMBIC = True
 BF_ALEMBIC = '/opt/lib/alembic'
-BF_ALEMBIC_LIB = 'AlembicAbc AlembicAbcCollection AlembicAbcCoreFactory AlembicAbcCoreHDF5 AlembicAbcCoreAbstract AlembicAbcCoreOgawa AlembicAbcGeom AlembicAbcMaterial AlembicOgawa AlembicUtil ' + \
-    '${BF_HDF5}/lib/hdf5 ${BF_HDF5}/lib/hdf5_hl'
+BF_ALEMBIC_LIB = 'AlembicAbcGeom AlembicAbc AlembicAbcCollection AlembicAbcCoreFactory AlembicAbcCoreHDF5 AlembicAbcCoreAbstract AlembicAbcCoreOgawa AlembicAbcMaterial AlembicOgawa AlembicUtil'
 BF_ALEMBIC_INC = '${BF_ALEMBIC}/include'
 BF_ALEMBIC_LIBPATH='${BF_ALEMBIC}/lib/static'
 
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 177d698..b740916 100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -205,6 +205,9 @@ def setup_staticlibs(lenv):
         if lenv['WITH_BF_STATICOIIO']:
             statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
 
+    if lenv['WITH_BF_HDF5']:
+        libincs += Split(lenv['BF_HDF5_LIBPATH'])
+
     if lenv['WITH_BF_ALEMBIC']:
         libincs += Split(lenv['BF_ALEMBIC_LIBPATH'])
 
@@ -288,6 +291,9 @@ def setup_syslibs(lenv):
         if not lenv['WITH_BF_STATICOCIO']:
             syslibs += Split(lenv['BF_OCIO_LIB'])
 
+    if lenv['WITH_BF_HDF5']:
+        syslibs += Split(lenv['BF_HDF5_LIB'])
+
     if lenv['WITH_BF_ALEMBIC']:
         syslibs += Split(lenv['BF_ALEMBIC_LIB'])