[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49827] trunk/blender: Fix El Topo compile with scons (only win64 so far)

[Daniel Genrich]

Revision: 49827
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49827
Author:   genscher
Date:     2012-08-12 00:19:55 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
Fix El Topo compile with scons (only win64 so far)

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/extern/eltopo/SConscript

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-08-12 00:09:57 UTC (rev 49826)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-08-12 00:19:55 UTC (rev 49827)
@@ -97,6 +97,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'
 

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-08-12 00:09:57 UTC (rev 49826)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-08-12 00:19:55 UTC (rev 49827)
@@ -159,6 +159,10 @@
         libincs += Split(lenv['BF_FFTW3_LIBPATH'])
         if lenv['WITH_BF_STATICFFTW3']:
             statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
+    if lenv['WITH_BF_ELTOPO']:
+        libincs += Split(lenv['BF_LAPACK_LIBPATH'])
+        if lenv['WITH_BF_STATICLAPACK']:
+		    statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])        
     if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
         statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
     if lenv['WITH_BF_INTERNATIONAL']:
@@ -264,6 +268,8 @@
         syslibs += Split(lenv['BF_SNDFILE_LIB'])
     if lenv['WITH_BF_FFTW3'] and not lenv['WITH_BF_STATICFFTW3']:
         syslibs += Split(lenv['BF_FFTW3_LIB'])
+    if lenv['WITH_BF_ELTOPO']:
+        syslibs += Split(lenv['BF_LAPACK_LIB'])
     if lenv['WITH_BF_SDL']:
         syslibs += Split(lenv['BF_SDL_LIB'])
     if not lenv['WITH_BF_STATICOPENGL']:

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2012-08-12 00:09:57 UTC (rev 49826)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-08-12 00:19:55 UTC (rev 49827)
@@ -120,7 +120,7 @@
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
             'WITH_BF_GAMEENGINE',
             'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
-            'WITH_BF_ELTOPO',
+            'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
             'BF_WINTAB', 'BF_WINTAB_INC',
             'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
             'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -393,7 +393,13 @@
         (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
 
         (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
+        
         (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
+        ('BF_LAPACK', 'LAPACK base path', ''),
+        ('BF_LAPACK_LIB', 'LAPACK library', ''),
+        ('BF_LAPACK_LIB_STATIC', 'LAPACK library', ''),
+        ('BF_LAPACK_LIBPATH', 'LAPACK library path', ''),
+        (BoolVariable('WITH_BF_STATICLAPACK', 'Staticly link to LAPACK', False)),
         
         ('BF_BULLET', 'Bullet base dir', ''),
         ('BF_BULLET_INC', 'Bullet include path', ''),

Modified: trunk/blender/extern/eltopo/SConscript
===================================================================
--- trunk/blender/extern/eltopo/SConscript	2012-08-12 00:09:57 UTC (rev 49826)
+++ trunk/blender/extern/eltopo/SConscript	2012-08-12 00:19:55 UTC (rev 49827)
@@ -1,28 +1,20 @@
 #!/usr/bin/python
-import sys
-import os
 
 Import('env')
 
-defs = ' -DUSE_FORTRAN_BLAS -DNOGUI'
-cflags = []
+defs = []
 
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    defs += ' WIN32 NDEBUG _WINDOWS'
-    #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
-    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
-elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross', 'win64-mingw'):
-    defs += ' NDEBUG'
-    cflags += ['-O2']
-elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
-    defs += ' NDEBUG'
-    cflags += ['-O2']
-elif sys.platform=='darwin':
-    defs += ' NDEBUG'
-    cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
 
-eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/sparse/*.cpp") + env.Glob("common/meshes/*.cpp") + ["eltopo-capi.cpp"]
-incs = '. common eltopo3d common/newsparse common/meshes common/sparse'
+eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/sparse/*.cpp") + ["eltopo-capi.cpp"]
+eltopo_src.remove( "common\\gluvi.cpp" )
+eltopo_src.remove( "common\\openglutils.cpp" )
 
-env.BlenderLib ( libname = 'extern_eltopo3d', sources=eltopo_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
+# print(eltopo_src)
 
+defs.append('USE_FORTRAN_BLAS')
+defs.append('NO_GUI')
+
+incs = '. common eltopo3d common/newsparse common/meshes common/sparse common/tunicate'
+
+env.BlenderLib ('extern_eltopo3d', Split(eltopo_src), Split(incs), defs, libtype=['extern'], priority=[40] )
+