diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 23:26:10 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-05 23:26:10 +0400 |
| commit | 914a4d1a6c39b90ca631fa82742097749236322d (patch) | |
| tree | 895b62d20fd6789b80c93340fcb7399f7027d56e | |
| parent | 102868467b619734f985718c4b1e8a483c56e911 (diff) | |
soc-2008-mxcurioni: lib3ds compiles as an external library
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | config/darwin-config.py | 2 | ||||
| -rw-r--r-- | extern/SConscript | 3 | ||||
| -rw-r--r-- | extern/freestyle/SConscript | 0 | ||||
| -rw-r--r-- | tools/Blender.py | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index bb8773329b2..90092c51573 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/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile']: 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 071a245202b..856317cd627 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -162,7 +162,7 @@ WITH_BF_YAFRAY = 'true' WITH_BF_FREESTYLE = 'true' BF_FREESTYLE = '#extern/freestyle' -BF_FREESTYLE_SRC = '${BF_FREESTYLE}/src' +BF_FREESTYLE_SRC = '#source/blender/freestyle/src' BF_SWIG = '${BF_FREESTYLE}/swig' BF_LIB3DS = '${BF_FREESTYLE}/lib3ds' BF_LIB3DS_LIB = 'extern_lib3ds' diff --git a/extern/SConscript b/extern/SConscript index 09eaf080c28..8ab451a8024 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -9,6 +9,9 @@ if env['WITH_BF_GAMEENGINE']: if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) +if env['WITH_BF_FREESTYLE']: + SConscript(['freestyle/lib3ds/SConscript']) + if env['WITH_BF_INTERNATIONAL']: SConscript(['bFTGL/SConscript']) diff --git a/extern/freestyle/SConscript b/extern/freestyle/SConscript deleted file mode 100644 index e69de29bb2d..00000000000 --- a/extern/freestyle/SConscript +++ /dev/null diff --git a/tools/Blender.py b/tools/Blender.py index e4d143935a3..17010fcd308 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -163,7 +163,7 @@ 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']: + if lenv['WITH_BF_FREESTYLE']: syslibs += Split(lenv['BF_LIB3DS_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: |