[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22444] branches/soc-2009-yukishiro: change scons file to link statcially.

[Jingyuan Huang]

Revision: 22444
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22444
Author:   yukishiro
Date:     2009-08-14 00:26:24 +0200 (Fri, 14 Aug 2009)

Log Message:
-----------
change scons file to link statcially. need to upload lib files.

Modified Paths:
--------------
    branches/soc-2009-yukishiro/config/linux2-config.py
    branches/soc-2009-yukishiro/tools/Blender.py

Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py	2009-08-13 22:10:50 UTC (rev 22443)
+++ branches/soc-2009-yukishiro/config/linux2-config.py	2009-08-13 22:26:24 UTC (rev 22444)
@@ -157,9 +157,9 @@
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
 # LAPACK
-BF_LAPACK = "/usr"
+BF_LAPACK = LIBDIR + "/lapack"
 BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
-BF_LAPACK_LIB = 'lapack'
+BF_LAPACK_LIB = 'lapack blas gfortran'
 
 ##
 CC = 'gcc'

Modified: branches/soc-2009-yukishiro/tools/Blender.py
===================================================================
--- branches/soc-2009-yukishiro/tools/Blender.py	2009-08-13 22:10:50 UTC (rev 22443)
+++ branches/soc-2009-yukishiro/tools/Blender.py	2009-08-13 22:26:24 UTC (rev 22444)
@@ -118,7 +118,8 @@
 		lenv['BF_PNG_LIBPATH'],
 		lenv['BF_ZLIB_LIBPATH'],
 		lenv['BF_LIBSAMPLERATE_LIBPATH'],
-		lenv['BF_ICONV_LIBPATH']
+		lenv['BF_ICONV_LIBPATH'],
+		lenv['BF_LAPACK_LIBPATH']
 		]
 
 	libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
@@ -150,7 +151,6 @@
 
 	if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 		libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
-        libincs += Split(lenv['BF_LAPACK_LIBPATH'])
 
 	return statlibs, libincs