[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12917] trunk/blender/source/blender/ python/SConscript: More compiling fixes for BPyApi on mingw:

[Joshua Leung]

Revision: 12917
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12917
Author:   aligorith
Date:     2007-12-17 07:24:10 +0100 (Mon, 17 Dec 2007)

Log Message:
-----------
More compiling fixes for BPyApi on mingw:
* When using split-srcs hack, a linking error occurred as the 2_4x api sources weren't getting built

Modified Paths:
--------------
    trunk/blender/source/blender/python/SConscript

Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript	2007-12-17 06:12:01 UTC (rev 12916)
+++ trunk/blender/source/blender/python/SConscript	2007-12-17 06:24:10 UTC (rev 12917)
@@ -3,6 +3,9 @@
 
 sources = Split('BPY_interface.c BPY_menus.c') + env.Glob('api2_5x/*.c')
 
+if env['WITH_BF_PYAPI_V24X']==1:
+	sources += env.Glob('api2_4x/*.c')
+
 if env['BF_SPLIT_SRC'] == 1:
 	numobj = len(sources) 	 
 	maxobj = 30 	 
@@ -36,12 +39,12 @@
 
 if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
-
+	
 if env['WITH_BF_PYAPI_V24X']==1:
 	defs.append('WITH_PYAPI_V24X')
-	sources += env.Glob('api2_4x/*.c')
 	incs += ' api2_4x'
 
+
 if (env['BF_SPLIT_SRC'] == 1) and (env['OURPLATFORM'] == 'win32-mingw'): 	 
 	for i in range(numlibs): 	
 		env.BlenderLib ( libname='blender_python%d' % (i), sources = subsources[i], includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )