[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49829] trunk/blender/build_files/scons/ config: Fix El Topo compile with scons (win32 + linux - both untested)

Daniel Genrich daniel.genrich at gmx.net
Sun Aug 12 03:47:17 CEST 2012


Revision: 49829
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49829
Author:   genscher
Date:     2012-08-12 01:47:14 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
Fix El Topo compile with scons (win32 + linux - both untested)

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/linux-config.py
    trunk/blender/build_files/scons/config/win32-vc-config.py

Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py	2012-08-12 01:07:31 UTC (rev 49828)
+++ trunk/blender/build_files/scons/config/linux-config.py	2012-08-12 01:47:14 UTC (rev 49829)
@@ -105,6 +105,11 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
+WITH_BF_ELTOPO = False
+BF_LAPACK = '/usr'
+BF_LAPACK_LIB = 'lapack3gf blas clapack'
+BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
+
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-08-12 01:07:31 UTC (rev 49828)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-08-12 01:47:14 UTC (rev 49829)
@@ -101,6 +101,11 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
+WITH_BF_ELTOPO = False
+BF_LAPACK = LIBDIR + '/lapack'
+BF_LAPACK_LIB = 'libf2c clapack_nowrap BLAS_nowrap'
+BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
+
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 




More information about the Bf-blender-cvs mailing list