diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 20:56:44 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 20:56:44 +0400 |
| commit | ec906913842a9b56805b010153295419f198ed6a (patch) | |
| tree | 1499a319c77b12f19ca8c717f7185f8211b7adb9 /tools | |
| parent | 1cf33787932aabc9e2d812f4cf50655059dcbff2 (diff) | |
| parent | 945a083e70b79d361f5a9b1be76c9722565c9fe8 (diff) | |
merge to 14689, Freestyle library changes, SConscript start
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 7 | ||||
| -rwxr-xr-x | tools/btools.py | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 30e9979cf9a..e4d143935a3 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -121,6 +121,9 @@ def setup_staticlibs(lenv): ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + + if lenv['WITH_BF_FREESTYLE']: + libincs += Split(lenv['BF_LIB3DS_LIBPATH']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) @@ -160,12 +163,14 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) + if lenv['WITH_BF_FREESTYLE']: + syslibs += Split(lenv['BF_LIB3DS_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: syslibs += Split(lenv['BF_OPENGL_LIB']) if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'): syslibs += Split(lenv['BF_PTHREADS_LIB']) - + syslibs += Split(lenv['LLIBS']) return syslibs diff --git a/tools/btools.py b/tools/btools.py index 51367d6bd42..8158bf6cfcc 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -66,6 +66,7 @@ def validate_arguments(args, bc): 'BF_FANCY', 'BF_QUIET', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', + 'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC' ] arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', @@ -236,6 +237,16 @@ def read_opts(cfg, args): ('BF_SOLID_INC', 'Solid include path', ''), ('BF_WINTAB', 'WinTab base dir', ''), ('BF_WINTAB_INC', 'WinTab include dir', ''), + + (BoolOption('WITH_BF_FREESTYLE', 'Use Freestyle if true', 'true')), + ('BF_FREESTYLE', 'Freestyle base path', ''), + ('BF_FREESTYLE_SRC', 'Freestyle source path', ''), + ('BF_SWIG', 'SWIG base path', ''), + ('BF_LIB3DS', 'SWIG base path', ''), + ('BF_LIB3DS_LIB', 'lib3ds library', ''), + ('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''), + ('BF_LIB3DS_INC', 'lib3ds include path', ''), + ## ##WITH_BF_NSPR = 'true' ##BF_NSPR = $(LCGDIR)/nspr |