[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23012] branches/blender2.5/blender/source /blender: * fix linking order.

[Nathan Letwory]

Revision: 23012
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23012
Author:   jesterking
Date:     2009-09-05 01:22:46 +0200 (Sat, 05 Sep 2009)

Log Message:
-----------
* fix linking order.

NOTE: this needs changes to stubs.c, but need to check with ideasman_42 how to fix with cmake. Probably linking order issues, but stubs.c currently generates warnings for msvc (redefinition of funcs) and errors for mingw (same redefinitions). Removing the offending lines from stubs.c fixes that.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/avi/SConscript
    branches/blender2.5/blender/source/blender/blenkernel/SConscript
    branches/blender2.5/blender/source/blender/blenlib/SConscript
    branches/blender2.5/blender/source/blender/blenloader/SConscript
    branches/blender2.5/blender/source/blender/imbuf/SConscript
    branches/blender2.5/blender/source/blender/makesrna/SConscript
    branches/blender2.5/blender/source/blender/python/SConscript

Modified: branches/blender2.5/blender/source/blender/avi/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/avi/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/avi/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-#Import ('extra_includes')
 Import ('env')
 
 sources = env.Glob('intern/*.c')
@@ -7,4 +6,4 @@
 incs = '. #/intern/guardedalloc'
 incs += ' ' + env['BF_JPEG_INC']
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [185] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core'], priority = [190] )

Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -65,4 +65,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [165] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [166] )

Modified: branches/blender2.5/blender/source/blender/blenlib/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/blenlib/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -16,4 +16,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [363], compileflags =cflags )

Modified: branches/blender2.5/blender/source/blender/blenloader/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/blenloader/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -11,4 +11,4 @@
 
 defs = []
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [135] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core'], priority = [167] )

Modified: branches/blender2.5/blender/source/blender/imbuf/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/imbuf/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -35,4 +35,4 @@
 	incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [190] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [185] )

Modified: branches/blender2.5/blender/source/blender/makesrna/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/makesrna/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -37,4 +37,4 @@
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
 
-env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [195] )
+env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core'], priority = [165] )

Modified: branches/blender2.5/blender/source/blender/python/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/python/SConscript	2009-09-04 23:20:45 UTC (rev 23011)
+++ branches/blender2.5/blender/source/blender/python/SConscript	2009-09-04 23:22:46 UTC (rev 23012)
@@ -13,9 +13,9 @@
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
 
 
 # generic
 sources = env.Glob('generic/*.c')
-env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) # ketsji is 360
+env.BlenderLib( libname = 'bf_gen_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [362]) # ketsji is 360