diff options
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | config/darwin-config.py | 9 | ||||
-rw-r--r-- | config/linux2-config.py | 9 | ||||
-rw-r--r-- | config/linuxcross-config.py | 8 | ||||
-rw-r--r-- | config/openbsd3-config.py | 9 | ||||
-rw-r--r-- | config/sunos5-config.py | 9 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 9 | ||||
-rw-r--r-- | config/win32-vc-config.py | 9 | ||||
-rw-r--r-- | source/blender/freestyle/SConscript | 2 | ||||
-rw-r--r-- | tools/Blender.py | 2 | ||||
-rwxr-xr-x | tools/btools.py | 9 |
11 files changed, 15 insertions, 62 deletions
diff --git a/SConstruct b/SConstruct index 69908045173..53b3ce70328 100644 --- a/SConstruct +++ b/SConstruct @@ -269,7 +269,7 @@ if not quickie and do_clean: print "clean dir %s"%(B.root_build_dir+dir) shutil.rmtree(B.root_build_dir+dir) for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', - 'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile','extern/freestyle/swig/Makefile']: + 'extern/xvidcore/build/generic/platform.inc']: if os.path.exists(confile): print "clean file %s"%confile os.remove(confile) diff --git a/config/darwin-config.py b/config/darwin-config.py index 4c3b5d19e36..c9b47ed8e7b 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -161,13 +161,8 @@ BF_SOLID_LIB = 'extern_solid' WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + # WITH_BF_OPENEXR = 'true' # BF_OPENEXR = '${LCGDIR}/openexr' diff --git a/config/linux2-config.py b/config/linux2-config.py index 4ee5aabfbd3..b9c6e888b70 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -87,13 +87,8 @@ BF_SOLID_LIB = 'extern_solid' WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index c695e0e04e3..e3a22f833f7 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -7,13 +7,7 @@ BF_VERSE_INCLUDE = "#extern/verse/dist" WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + ########################### diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 6b8d30f8bca..feeb94ed9b1 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -81,13 +81,8 @@ BF_SOLID_LIB = 'extern_solid' WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 36ed610da3f..1939f9a5cbb 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -83,13 +83,8 @@ BF_SOLID_LIB = 'extern_solid' WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index a0e85a07548..7e0c967b601 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -98,13 +98,8 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 5a637d18996..5eb95951b1f 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -109,13 +109,8 @@ WITH_BF_YAFRAY = 'true' WITH_BF_BINRELOC = 'false' WITH_BF_FREESTYLE = 'true' -BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '#source/blender/freestyle/src' -BF_SWIG = '${BF_FREESTYLE}/swig' -BF_SWIG_LIB = 'extern_swig' -BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' -BF_LIB3DS_LIB = 'extern_lib3ds' -BF_LIB3DS_INC = '${BF_LIB3DS}' + + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index f74479a8309..93c931cdbfe 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -8,9 +8,7 @@ incs = '' incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python ' incs += '../render/extern/include ../render/intern/include ../include ../src' -incs += ' #/extern/freestyle/lib3ds' incs += ' ' + env['BF_PYTHON_INC'] -incs += ' ' + env['BF_LIB3DS_INC'] incs += ' ' + env['BF_PNG_INC'] ######################################################## diff --git a/tools/Blender.py b/tools/Blender.py index 5eaeab7f5ae..f931cc7af22 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -158,8 +158,6 @@ 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']) diff --git a/tools/btools.py b/tools/btools.py index a890315e7bf..f8f9eacd6b1 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -66,7 +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_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_INC' + 'BF_WITH_BF_FREESTYLE' ] arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', @@ -251,13 +251,6 @@ def read_opts(cfg, args): ('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_SWIG_LIB', 'SWIG library', ''), - ('BF_LIB3DS', 'lib3ds base path', ''), - ('BF_LIB3DS_LIB', 'lib3ds library', ''), - ('BF_LIB3DS_INC', 'lib3ds include path', ''), ## ##WITH_BF_NSPR = 'true' |