diff options
| -rw-r--r-- | intern/boolop/SConscript | 6 | ||||
| -rw-r--r-- | intern/bsp/SConscript | 6 | ||||
| -rw-r--r-- | intern/opennl/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/src/SConscript | 15 |
4 files changed, 25 insertions, 7 deletions
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript index ad76cc6a5e5..a3f3c0b6433 100644 --- a/intern/boolop/SConscript +++ b/intern/boolop/SConscript @@ -7,4 +7,8 @@ incs = '. intern extern ../moto/include ../container ../memutil' incs += ' ../../source/blender/makesdna ../../intern/guardedalloc' incs += ' ../../source/blender/blenlib' -env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 ) +if (env['OURPLATFORM'] == 'win32-mingw'): + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] ) +else: + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 ) + diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 6dc3deb7109..e363fd1d4c3 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -5,4 +5,8 @@ sources = env.Glob('intern/*.cpp') incs = 'intern ../container ../moto/include ../memutil' -env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 ) +if (env['OURPLATFORM'] == 'win32-mingw'): + env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] ) +else: + env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 ) + diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript index b1cbdeb8ba3..bcfb030f7e6 100644 --- a/intern/opennl/SConscript +++ b/intern/opennl/SConscript @@ -5,5 +5,8 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') incs = 'extern superlu' -env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 ) +if (env['OURPLATFORM'] == 'win32-mingw'): + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) +else: + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 ) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index d0a07f9b3d8..58aa3ddad88 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -5,10 +5,17 @@ Import ('env') sources = env.Glob('*.c') numobj = len(sources) +maxobj = 30 + +numlibs = numobj / maxobj +if (numobj % maxobj): + numlibs = numlibs + 1 +subsources = [] if (env['OURPLATFORM'] == 'win32-mingw'): - sources1 = sources[:(numobj/2)] - sources2 = sources[(numobj/2):] + for i in range(numlibs - 1): + subsources.append(sources[i*maxobj:(i+1)*maxobj]) + subsources.append(sources[(numlibs-1)*maxobj:]) incs = ' #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../makesdna ../blenkernel' @@ -57,7 +64,7 @@ if env['BF_BUILDINFO'] == 1: defs.append('NAN_BUILDINFO') if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ( libname = 'src1', sources = sources1, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) - env.BlenderLib ( libname = 'src2', sources = sources2, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) + for i in range(numlibs): + env.BlenderLib ( libname = 'src%d' % (i), sources = subsources[i], includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) else: env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) |