[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49914] branches/cloth-eltopo: Fix compile errors on Linux + scons

Daniel Genrich daniel.genrich at gmx.net
Wed Aug 15 12:10:29 CEST 2012


Revision: 49914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49914
Author:   genscher
Date:     2012-08-15 10:10:29 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Fix compile errors on Linux + scons

Modified Paths:
--------------
    branches/cloth-eltopo/build_files/scons/tools/Blender.py
    branches/cloth-eltopo/build_files/scons/tools/btools.py
    branches/cloth-eltopo/extern/eltopo/SConscript
    branches/cloth-eltopo/extern/eltopo/eltopo3d/edgecollapser.cpp

Modified: branches/cloth-eltopo/build_files/scons/tools/Blender.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/tools/Blender.py	2012-08-15 10:03:29 UTC (rev 49913)
+++ branches/cloth-eltopo/build_files/scons/tools/Blender.py	2012-08-15 10:10:29 UTC (rev 49914)
@@ -268,7 +268,7 @@
         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'] and not lenv['WITH_BF_LAPACK_STATIC']:
+    if lenv['WITH_BF_ELTOPO'] and not lenv['WITH_BF_STATICLAPACK']:
         syslibs += Split(lenv['BF_LAPACK_LIB'])
     if lenv['WITH_BF_SDL']:
         syslibs += Split(lenv['BF_SDL_LIB'])

Modified: branches/cloth-eltopo/build_files/scons/tools/btools.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/tools/btools.py	2012-08-15 10:03:29 UTC (rev 49913)
+++ branches/cloth-eltopo/build_files/scons/tools/btools.py	2012-08-15 10:10:29 UTC (rev 49914)
@@ -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', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
+            'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'WITH_BF_STATICLAPACK', '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',

Modified: branches/cloth-eltopo/extern/eltopo/SConscript
===================================================================
--- branches/cloth-eltopo/extern/eltopo/SConscript	2012-08-15 10:03:29 UTC (rev 49913)
+++ branches/cloth-eltopo/extern/eltopo/SConscript	2012-08-15 10:10:29 UTC (rev 49914)
@@ -7,9 +7,8 @@
 defs = []
 
 
-eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/tunicate/*.cpp") + env.Glob("common/sparse/*.cpp") + ["eltopo-capi.cpp"]
+eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/tunicate/*.cpp") + env.Glob("common/sparse/*.cpp")
 eltopo_src.remove( "common" + os.sep + "gluvi.cpp" )
-eltopo_src.remove( "common" + os.sep + "openglutils.cpp" )
 
 defs.append('USE_FORTRAN_BLAS')
 defs.append('NO_GUI')

Modified: branches/cloth-eltopo/extern/eltopo/eltopo3d/edgecollapser.cpp
===================================================================
--- branches/cloth-eltopo/extern/eltopo/eltopo3d/edgecollapser.cpp	2012-08-15 10:03:29 UTC (rev 49913)
+++ branches/cloth-eltopo/extern/eltopo/eltopo3d/edgecollapser.cpp	2012-08-15 10:10:29 UTC (rev 49914)
@@ -7,6 +7,8 @@
 //
 // ---------------------------------------------------------
 
+#include <stdio.h>
+
 #include <edgecollapser.h>
 
 #include <broadphase.h>




More information about the Bf-blender-cvs mailing list