[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15914] trunk/blender/intern: Scons - Mingw Compiling Fix:

[Joshua Leung]

Revision: 15914
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15914
Author:   aligorith
Date:     2008-08-02 02:25:50 +0200 (Sat, 02 Aug 2008)

Log Message:
-----------
Scons - Mingw Compiling Fix:

When using BF_SPLIT_SRCS as a hack to get some of the larger libs compiled, there were some problems linking Blender related to some boolean calls. This commit tweaks the priorities for the boolean libs for the 'intern' group so that they get linked before the src libs are.

Modified Paths:
--------------
    trunk/blender/intern/boolop/SConscript
    trunk/blender/intern/bsp/SConscript

Modified: trunk/blender/intern/boolop/SConscript
===================================================================
--- trunk/blender/intern/boolop/SConscript	2008-08-01 23:39:52 UTC (rev 15913)
+++ trunk/blender/intern/boolop/SConscript	2008-08-02 00:25:50 UTC (rev 15914)
@@ -8,7 +8,7 @@
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] )
 else:
     env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 

Modified: trunk/blender/intern/bsp/SConscript
===================================================================
--- trunk/blender/intern/bsp/SConscript	2008-08-01 23:39:52 UTC (rev 15913)
+++ trunk/blender/intern/bsp/SConscript	2008-08-02 00:25:50 UTC (rev 15914)
@@ -6,7 +6,7 @@
 incs = 'intern ../container ../moto/include ../memutil'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
+    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,69] )
 else:
     env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 )