[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14716] branches/soc-2008-mxcurioni: soc= 2008-mxcurioni: reverted back to compiling swig as a binary, instead of as a library

[Maxime Curioni]

Revision: 14716
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14716
Author:   mxcurioni
Date:     2008-05-07 05:37:16 +0200 (Wed, 07 May 2008)

Log Message:
-----------
soc=2008-mxcurioni: reverted back to compiling swig as a binary, instead of as a library

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
    branches/soc-2008-mxcurioni/tools/Blender.py

Modified: branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript	2008-05-07 00:37:38 UTC (rev 14715)
+++ branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript	2008-05-07 03:37:16 UTC (rev 14716)
@@ -202,13 +202,24 @@
 			'Source/Preprocessor',
 			'Source/Swig' ]
 
-swig_env.BlenderLib (libname="extern_swig",
+swig_env.Append(CPPDEFINES = defines)
+swig_env.Append(CCFLAGS = cflags)
+swig_env.Append(CXXFLAGS = cflags)
+
+swig_env.BlenderProg(builddir="#"+root_build_dir+os.sep,
+					 progname='swig',
 					 sources=swig_source_files,
-                     includes=includes,
-                     defines=defines,
-                     libtype=['blender'],
-                     priority = [15],
-                     compileflags = cflags)
+					 includes=includes,
+					 libs=[],
+					 libpath='#'+root_build_dir+'/lib')
 
+# swig_env.BlenderLib (libname="extern_swig",
+# 					 sources=swig_source_files,
+#                      includes=includes,
+#                      defines=defines,
+#                      libtype=['blender'],
+#                      priority = [15],
+#                      compileflags = cflags)
 
 
+

Modified: branches/soc-2008-mxcurioni/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/tools/Blender.py	2008-05-07 00:37:38 UTC (rev 14715)
+++ branches/soc-2008-mxcurioni/tools/Blender.py	2008-05-07 03:37:16 UTC (rev 14716)
@@ -462,7 +462,8 @@
         program_list.append(prog)
         if  lenv['OURPLATFORM']=='darwin':
             lenv['BINARYKIND'] = binarykind
-            lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
+            if progname != "swig":
+            	lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
         return prog
 
     def Glob(lenv, pattern):