diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-12 04:19:55 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-12 04:19:55 +0400 |
| commit | 1aaaf67a9e42cfbba6d8c955a9e0a7519b296933 (patch) | |
| tree | d2973425bbc449fdb1507ee105122a3639cdab46 /build_files | |
| parent | b96c6220157807cbfa3568031d5ab688280fe1d6 (diff) | |
Fix El Topo compile with scons (only win64 so far)
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 5 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 6 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 681e058f5be..b6a3c108cdb 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -97,6 +97,11 @@ BF_BULLET = '#extern/bullet2/src' 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' diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index e07c0d6f0de..56d13649cd1 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -159,6 +159,10 @@ def setup_staticlibs(lenv): 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 @@ def setup_syslibs(lenv): 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']: diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 034d261e7cd..8f5bb1ffc57 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -120,7 +120,7 @@ def validate_arguments(args, bc): '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 @@ def read_opts(env, cfg, args): (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', ''), |