diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-09-16 10:31:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-09-16 10:31:55 +0400 |
commit | 0f39be9ce832894443a728dedf86c82d8cb59d84 (patch) | |
tree | b2f95210567c3401a76f13c6100d56722ed2d19f /tools | |
parent | 5df9b4938ea4cd0e838bd512c70c859fa4252644 (diff) |
added static openal and openexr options for scons.
also added a target 'blenderlite' - turns almost everything off, compressed binary is ~3.4meg
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Blender.py | 18 | ||||
-rwxr-xr-x | tools/btools.py | 13 |
2 files changed, 23 insertions, 8 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 3f928ff8c97..b5f32f24551 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -117,15 +117,21 @@ def setup_staticlibs(lenv): lenv['BF_ZLIB_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] - libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + + libincs += Split(lenv['BF_FFMPEG_LIBPATH']) - + + if lenv['WITH_BF_OPENEXR']: + libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_STATICOPENEXR']: + statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_OPENAL']: libincs += Split(lenv['BF_OPENAL_LIBPATH']) - + if lenv['WITH_BF_STATICOPENAL']: + statlibs += Split(lenv['BF_OPENAL_LIB_STATIC']) if lenv['WITH_BF_STATICOPENGL']: statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) @@ -154,13 +160,15 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_FREETYPE_LIB']) syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: - syslibs += Split(lenv['BF_OPENAL_LIB']) + if not lenv['WITH_BF_STATICOPENAL']: + syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc': syslibs += ['gomp'] if lenv['WITH_BF_ICONV']: syslibs += Split(lenv['BF_ICONV_LIB']) if lenv['WITH_BF_OPENEXR']: - syslibs += Split(lenv['BF_OPENEXR_LIB']) + if not lenv['WITH_BF_STATICOPENEXR']: + syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) diff --git a/tools/btools.py b/tools/btools.py index afcc83d2002..be23b1d7024 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -28,11 +28,11 @@ def print_arguments(args, bc): def validate_arguments(args, bc): opts_list = [ 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LINKFLAGS', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', - 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', + 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_FMOD', - 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', + 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', 'WITH_BF_DDS', 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', @@ -94,7 +94,7 @@ def print_targets(targs, bc): def validate_targets(targs, bc): valid_list = ['.', 'blender', 'blenderstatic', 'blenderplayer', 'webplugin', - 'blendernogame', 'blenderstaticnogame', 'release', + 'blendernogame', 'blenderstaticnogame', 'blenderlite', 'release', 'everything', 'clean', 'install-bin', 'install', 'nsis'] oklist = [] for t in targs: @@ -139,6 +139,7 @@ def read_opts(cfg, args): ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"), ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'), ('BF_DEBUG_LIBS', 'list of libraries to build with debug symbols'), + ('BF_PYTHON', 'base path for python', ''), ('BF_PYTHON_VERSION', 'Python version to use', ''), ('BF_PYTHON_INC', 'include path for Python headers', ''), @@ -148,13 +149,17 @@ def read_opts(cfg, args): ('BF_PYTHON_LIBPATH', 'Library path', ''), ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), (BoolOption('WITH_BF_STATICPYTHON', 'Staticly link to python', 'false')), + (BoolOption('BF_NO_ELBEEM', 'Disable Fluid Sim', 'false')), (BoolOption('WITH_BF_YAFRAY', 'Enable Yafray', 'true')), + (BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', '')), ('BF_OPENAL', 'base path for OpenAL', ''), ('BF_OPENAL_INC', 'include path for python headers', ''), ('BF_OPENAL_LIB', 'Path to OpenAL library', ''), + ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''), ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''), + (BoolOption('WITH_BF_STATICOPENAL', 'Staticly link to openal', 'false')), (BoolOption('WITH_BF_SDL', 'Use SDL if true', '')), ('BF_SDL', 'SDL base path', ''), @@ -171,10 +176,12 @@ def read_opts(cfg, args): # BF_FMOD = $(LCGDIR)/fmod (BoolOption('WITH_BF_OPENEXR', 'Use OPENEXR if true', 'true')), + (BoolOption('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', 'false')), ('BF_OPENEXR', 'OPENEXR base path', ''), ('BF_OPENEXR_INC', 'OPENEXR include path', ''), ('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), + ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), (BoolOption('WITH_BF_DDS', 'Use DDS if true', 'true')), |