[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14884] branches/soc-2008-mxcurioni: corrected swig Sconscript to compile on unix-like machines

[Maxime Curioni]

Revision: 14884
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14884
Author:   mxcurioni
Date:     2008-05-18 16:10:44 +0200 (Sun, 18 May 2008)

Log Message:
-----------
corrected swig Sconscript to compile on unix-like machines

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
    branches/soc-2008-mxcurioni/source/blender/yafray/SConscript

Modified: branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript	2008-05-18 13:57:47 UTC (rev 14883)
+++ branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript	2008-05-18 14:10:44 UTC (rev 14884)
@@ -23,7 +23,13 @@
 else:
 	#  Configure
 	print "Configuring swig..."
-
+	
+	if not os.path.isfile(root + "/Source/Include/swigconfig.h"):
+		os.chdir(root)
+		os.system("sh -c './configure'")
+	else:
+	    print "(skipped, swigconfig.h already exists)"
+	
 	cflags = ['-g', '-O2', '-Wall', '-W','-ansi','-pedantic']
 	defines = ['-DHAVE_CONFIG_H']
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-18 13:57:47 UTC (rev 14883)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-18 14:10:44 UTC (rev 14884)
@@ -63,8 +63,8 @@
 				sources=sources,
                 includes=Split(incs),
                 defines=defs,
-				libtype=['blender'],
-                priority = [20] )
+				libtype=['player'],
+                priority = [280] )
 
 ########################################################
 # SWIG

Modified: branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript	2008-05-18 13:57:47 UTC (rev 14883)
+++ branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript	2008-05-18 14:10:44 UTC (rev 14884)
@@ -31,4 +31,4 @@
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player','blender'], priority = [80, 40, -1] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )

Modified: branches/soc-2008-mxcurioni/source/blender/yafray/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/yafray/SConscript	2008-05-18 13:57:47 UTC (rev 14883)
+++ branches/soc-2008-mxcurioni/source/blender/yafray/SConscript	2008-05-18 14:10:44 UTC (rev 14884)
@@ -6,4 +6,4 @@
 incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
 incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include'
 
-env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
+env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[10, 190] )