diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-21 15:36:50 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-21 15:36:50 +0300 |
| commit | 11fd198a702d11e79dbc74307e3f5ba6a12c1159 (patch) | |
| tree | 1898cfc1204a1d3db5ba9a50c21edfb3e389b9e2 /tools | |
| parent | a2a2ad98e2774930347ffd09a691c1e6d4802ce0 (diff) | |
==SCons==
* when WITH_BF_STATICOPENGL=1 on Linux Blender will be statically linked
against GL libraries. NOTE: I used values that worked on my machine -
platform managers and people who have better knowledge about this, please
modify config/linux2-config.py accordingly.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 6 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 377e96f3d76..ad744697c7a 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -121,6 +121,9 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_OPENAL']: libincs += Split(lenv['BF_OPENAL_LIBPATH']) + if lenv['WITH_BF_STATICOPENGL']: + statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) + return statlibs, libincs def setup_syslibs(lenv): @@ -142,7 +145,8 @@ def setup_syslibs(lenv): if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) - syslibs += Split(lenv['BF_OPENGL_LIB']) + if not lenv['WITH_BF_STATICOPENGL']: + syslibs += Split(lenv['BF_OPENGL_LIB']) syslibs += Split(lenv['LLIBS']) return syslibs diff --git a/tools/btools.py b/tools/btools.py index be5a4455542..afa21f2d28f 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -33,7 +33,7 @@ def validate_arguments(args, bc): 'BF_SOLID', 'BF_SOLID_INC', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', - 'WITH_BF_OPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS', + 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS', 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', 'WITH_BF_FFMPEG', 'WITH_BF_PLAYER', @@ -218,7 +218,7 @@ def read_opts(cfg, args): ('BF_QUICKTIME_LIB', 'QuickTime library', ''), ('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''), - (BoolOption('WITH_BF_OPENGL', 'Use MESA if true', 'true')), + (BoolOption('WITH_BF_STATICOPENGL', 'Use MESA if true', 'true')), ('BF_OPENGL', 'OpenGL base path', ''), ('BF_OPENGL_INC', 'OpenGL include path', ''), ('BF_OPENGL_LIB', 'OpenGL libraries', ''), |