From 6a53c0ae6ad615f43adb12dfb380ca6bd642eb26 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Tue, 28 Nov 2006 21:12:31 +0000 Subject: =Scons= I should have talked to joeedh before committing last time... This is an another attempt to fix the mingw long commandline issue on all versions of windows (I didn't realize that the 2k in Win2k refered to the length of the commandline). In this version, I break libsrc.a up so that no archive has more than 30 object files (adjustable with one line of code). I also fudge the priority numbers to ensure correct linking. This was done in a "guess the number" way until it worked, so please test and please check for correctness. --- intern/boolop/SConscript | 6 +++++- intern/bsp/SConscript | 6 +++++- intern/opennl/SConscript | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'intern') 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 ) -- cgit v1.2.3