soc-2008-mxcurioni: lib3ds compiles as an external library

diff --git a/SConstruct b/SConstruct
index bb8773329b2c6d4d7720cad2edabf83edd0762f2..90092c51573d4e06a994724eb2f50076d692fdd0 100644 (file)
--- 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 071a245202b3c77afa71843926524505fafc0b44..856317cd627f33610c12bfb393604bd8b529f197 100644 (file)
--- 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 09eaf080c28df948aafe1010232a82b4976ac4a2..8ab451a8024b43edf0c051e7eb58a072a56d66e5 100644 (file)
--- 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 (file)
index e69de29..0000000

diff --git a/tools/Blender.py b/tools/Blender.py
index e4d143935a390042d2c0925542791063ed30b793..17010fcd30829b6698b4770f1027e39cc14da9f1 100644 (file)
--- 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']: