[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44310] trunk/blender/source/blender: Attempt to fix scons compilation of blenderplayer.

[Antony Riakiotakis]

Revision: 44310
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44310
Author:   psy-fi
Date:     2012-02-22 03:16:34 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Attempt to fix scons compilation of blenderplayer.
Added bmesh to player libraries and changed the priority of blenlib so as to avoid duplicate definitions (looks like there are actually functions defined twice that cause conflicts if one changes the order of linking...figures).

Only tested this on mingw-windows, I hope it works elsewhere too.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/SConscript
    trunk/blender/source/blender/bmesh/SConscript

Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript	2012-02-22 00:06:15 UTC (rev 44309)
+++ trunk/blender/source/blender/blenlib/SConscript	2012-02-22 03:16:34 UTC (rev 44310)
@@ -27,4 +27,4 @@
     if env['WITH_BF_OPENMP']:
        env.Append(CFLAGS=['-DPARALLEL=1'])
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,230], compileflags =cflags )

Modified: trunk/blender/source/blender/bmesh/SConscript
===================================================================
--- trunk/blender/source/blender/bmesh/SConscript	2012-02-22 00:06:15 UTC (rev 44309)
+++ trunk/blender/source/blender/bmesh/SConscript	2012-02-22 03:16:34 UTC (rev 44310)
@@ -37,4 +37,4 @@
 incs.append('../editors/include')
 
 defs = []
-env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = 'core', defines=defs, priority=100, compileflags=cflags )
+env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100], compileflags=cflags )