[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52600] trunk/blender: hrmf, should try build with scons next time!

[Campbell Barton]

Revision: 52600
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52600
Author:   campbellbarton
Date:     2012-11-27 10:00:33 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
hrmf, should try build with scons next time!

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/extern/SConscript
    trunk/blender/source/blender/blenkernel/SConscript

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-11-27 09:52:20 UTC (rev 52599)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-11-27 10:00:33 UTC (rev 52600)
@@ -166,10 +166,12 @@
         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'])        
+            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']:
@@ -293,8 +295,10 @@
         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-11-27 09:52:20 UTC (rev 52599)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-11-27 10:00:33 UTC (rev 52600)
@@ -394,7 +394,6 @@
         (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)),  # this is now only available in a branch
         ('BF_LAPACK', 'LAPACK base path', ''),
         ('BF_LAPACK_LIB', 'LAPACK library', ''),

Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript	2012-11-27 09:52:20 UTC (rev 52599)
+++ trunk/blender/extern/SConscript	2012-11-27 10:00:33 UTC (rev 52600)
@@ -9,8 +9,10 @@
     SConscript(['recastnavigation/SConscript'])
 
 # now only available in a branch
-#if env['WITH_BF_ELTOPO']:
-#    SConscript(['eltopo/SConscript'])
+'''
+if env['WITH_BF_ELTOPO']:
+    SConscript(['eltopo/SConscript'])
+'''
 
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2012-11-27 09:52:20 UTC (rev 52599)
+++ trunk/blender/source/blender/blenkernel/SConscript	2012-11-27 10:00:33 UTC (rev 52600)
@@ -41,11 +41,12 @@
     if env['BF_DEBUG']:
         defs.append('DEBUG')
 
+'''
 if env['WITH_BF_ELTOPO']:
     incs += ' #/extern/eltopo'
     incs += ' #/extern/eltopo/eltopo3d'
     defs.append('WITH_ELTOPO')
-        
+'''
 if env['WITH_BF_QUICKTIME']:
     incs += ' ../quicktime'