diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
commit | 15da2232f7aa0f11a89e48f41f5730ddc8bb1b10 (patch) | |
tree | c6ed3ab740269771e8ffa8f04fd57f1c9a345455 /source/blender | |
parent | c344021b838a6fb2cbcc68b296144a734f74260f (diff) |
* tweak linking priorities - should help for GCC users
* some lib renaming
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/avi/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 16 | ||||
-rw-r--r-- | source/blender/blenlib/SConscript | 8 | ||||
-rw-r--r-- | source/blender/blenloader/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenpluginapi/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/SConscript | 9 | ||||
-rw-r--r-- | source/blender/editors/screen/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/SConscript | 2 | ||||
-rw-r--r-- | source/blender/ftfont/SConscript | 2 | ||||
-rw-r--r-- | source/blender/imbuf/SConscript | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/SConscript | 18 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/SConscript | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/SConscript | 4 | ||||
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 18 | ||||
-rw-r--r-- | source/blender/nodes/SConscript | 20 | ||||
-rw-r--r-- | source/blender/python/SConscript | 2 | ||||
-rw-r--r-- | source/blender/quicktime/SConscript | 10 | ||||
-rw-r--r-- | source/blender/radiosity/SConscript | 2 | ||||
-rw-r--r-- | source/blender/render/SConscript | 16 | ||||
-rw-r--r-- | source/blender/windowmanager/SConscript | 2 |
20 files changed, 79 insertions, 70 deletions
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript index 91239c66ead..8c16af9de9d 100644 --- a/source/blender/avi/SConscript +++ b/source/blender/avi/SConscript @@ -7,4 +7,4 @@ sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc' incs += ' ' + env['BF_JPEG_INC'] -env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] ) +env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [105, 40] ) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 75023f17d0f..96ec8c3fff2 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -26,22 +26,22 @@ if env['WITH_BF_VERSE']: defs += ' WITH_VERSE' if env['WITH_BF_OPENEXR'] == 1: - defs += ' WITH_OPENEXR' + defs += ' WITH_OPENEXR' if env['WITH_BF_DDS'] == 1: - defs += ' WITH_DDS' + defs += ' WITH_DDS' if env['WITH_BF_FFMPEG'] == 1: - defs += ' WITH_FFMPEG' - incs += ' ' + env['BF_FFMPEG_INC'] + defs += ' WITH_FFMPEG' + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME'] == 1: - defs += ' WITH_QUICKTIME' - incs += ' ' + env['BF_QUICKTIME_INC'] + defs += ' WITH_QUICKTIME' + incs += ' ' + env['BF_QUICKTIME_INC'] defs += ' WITH_CCGSUBSURF' if env['WITH_BF_PLAYER']: - SConscript(['bad_level_call_stubs/SConscript']) + SConscript(['bad_level_call_stubs/SConscript']) -env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) +env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [75, 10] ) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 23d06404f1b..9d81ac05472 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -11,16 +11,16 @@ incs += ' ' + env['BF_SDL_INC'] defs = '' if env['WITH_BF_INTERNATIONAL'] == 1: - defs = 'WITH_FREETYPE2' + defs = 'WITH_FREETYPE2' if env['WITH_BF_VERSE']: defs += ' WITH_VERSE' incs += ' ' + env['BF_VERSE_INCLUDE'] if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' + cflags='-pthread' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags ) +env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [100,195], compileflags =cflags ) diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index 097f54af7ae..37d5f5381fa 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -15,4 +15,4 @@ if env['WITH_BF_VERSE']: defs += ' WITH_VERSE' incs += ' ' + env['BF_VERSE_INCLUDE'] -env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [70, 30] ) +env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85, 25] ) diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript index d17a35e933e..aa6e25532b8 100644 --- a/source/blender/blenpluginapi/SConscript +++ b/source/blender/blenpluginapi/SConscript @@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME'] == 1: defs.append('WITH_QUICKTIME') incs += ' ' + env['BF_QUICKTIME_INC'] -env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [75, 35] ) +env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [90, 30] ) diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index e69de29bb2d..5743674bfb2 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -0,0 +1,9 @@ +#!/usr/bin/python +Import ('env') + +sources = env.Glob('*.c') + +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs += ' #/intern/guardedalloc' + +env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), [], libtype=['core','intern'], priority=[15, 30] ) diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index e02c0d06616..786caa1a143 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] ) +env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 3d630adb93f..14586dec7fe 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] ) +env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[25, 35] ) diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index aab303a1fd2..9cdfbe41026 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -8,7 +8,7 @@ incs = '. intern ../blenkernel ../blenlib ../makesdna ../editors/include' incs += ' ' + env['BF_FTGL_INC'] incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] - + defs = 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index f9e46b20d9a..9d8bcf56ec7 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -18,17 +18,17 @@ if env['WITH_BF_VERSE']: incs += ' ' + env['BF_VERSE_INCLUDE'] if env['WITH_BF_OPENEXR'] == 1: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') if env['WITH_BF_DDS'] == 1: - defs.append('WITH_DDS') + defs.append('WITH_DDS') if env['WITH_BF_FFMPEG'] == 1: - defs.append('WITH_FFMPEG') - incs += ' ' + env['BF_FFMPEG_INC'] + defs.append('WITH_FFMPEG') + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') -env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] ) +env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [95, 35] ) diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript index 7bfaa8dbdf2..9d3bbcbc058 100644 --- a/source/blender/imbuf/intern/cineon/SConscript +++ b/source/blender/imbuf/intern/cineon/SConscript @@ -4,14 +4,14 @@ Import ('env') source_files = env.Glob('*.c') incs = ['.', - '../../../blenkernel', - '../../', - '..', - '../../../blenlib', - 'intern/include', - '#/intern/guardedalloc', - '../../../makesdna'] + '../../../blenkernel', + '../../', + '..', + '../../../blenlib', + 'intern/include', + '#/intern/guardedalloc', + '../../../makesdna'] defs = [] - -env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) + +env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [120, 75]) diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript index d005bae02be..f56c238fd2a 100644 --- a/source/blender/imbuf/intern/dds/SConscript +++ b/source/blender/imbuf/intern/dds/SConscript @@ -16,4 +16,4 @@ incs = ['.', defs = ['WITH_DDS'] -env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) +env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [110, 105]) diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript index 1b0a0ed6110..2ce3d18feb5 100644 --- a/source/blender/imbuf/intern/openexr/SConscript +++ b/source/blender/imbuf/intern/openexr/SConscript @@ -14,5 +14,5 @@ incs = ['.', incs += Split(env['BF_OPENEXR_INC']) defs = [] - -env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) + +env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [125, 85]) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index fe712afbeeb..762f999fac6 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -14,28 +14,28 @@ dna = env.Copy() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', - '../../makesdna']) + '../../makesdna']) if env['OURPLATFORM'] == 'linuxcross': - makesdna_tool.Replace(CC='gcc') - makesdna_tool.Replace(AR='ar') - makesdna_tool.Replace(LINK='gcc') + makesdna_tool.Replace(CC='gcc') + makesdna_tool.Replace(AR='ar') + makesdna_tool.Replace(LINK='gcc') if sys.platform != 'cygwin': - makesdna_tool.Append (CCFLAGS = cflags) + makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: - makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) + makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) else: - makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) + makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) if env['OURPLATFORM'] != 'linuxcross': - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") + dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") else: - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET") + dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET") obj = 'intern/dna.c' Return ('obj') diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 0020094c6ea..746be45eb91 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -21,26 +21,26 @@ incs += ' ' + env['BF_SDL_INC'] defs = '' if env['WITH_BF_INTERNATIONAL']: - defs += 'WITH_FREETYPE2' + defs += 'WITH_FREETYPE2' if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' - incs += ' ' + env['BF_VERSE_INCLUDE'] + defs += ' WITH_VERSE' + incs += ' ' + env['BF_VERSE_INCLUDE'] if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' + defs += ' WITH_VERSE' if env['WITH_BF_OPENEXR'] == 1: - defs += ' WITH_OPENEXR' + defs += ' WITH_OPENEXR' if env['WITH_BF_FFMPEG'] == 1: - defs += ' WITH_FFMPEG' - incs += ' ' + env['BF_FFMPEG_INC'] + defs += ' WITH_FFMPEG' + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME'] == 1: - defs += ' WITH_QUICKTIME' - incs += ' ' + env['BF_QUICKTIME_INC'] + defs += ' WITH_QUICKTIME' + incs += ' ' + env['BF_QUICKTIME_INC'] defs += ' WITH_CCGSUBSURF' -env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) +env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [80, 15] ) diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 78bef4fb0ae..40adf0abbca 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -13,4 +13,4 @@ defs = [] if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']: defs.append('Py_TRACE_REFS') -env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [60]) +env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [70]) diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 97498560800..d9ab68251dd 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -2,7 +2,7 @@ Import ('env') source_files = ['apple/quicktime_import.c', - 'apple/quicktime_export.c'] + 'apple/quicktime_export.c'] incs = ['.', '../quicktime', @@ -20,10 +20,10 @@ incs = ['.', incs.append(env['BF_QUICKTIME_INC']) if env['OURPLATFORM'] in ['win32-vc', 'darwin']: - types = ['core', 'player'] - priorities = [95, 200] + types = ['core', 'player'] + priorities = [115, 200] else: - types = ['core'] - priorities = [95] + types = ['core'] + priorities = [115] env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype=types, priority=priorities) diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript index a3e2e7cafba..9939690b664 100644 --- a/source/blender/radiosity/SConscript +++ b/source/blender/radiosity/SConscript @@ -9,4 +9,4 @@ incs += ' ../render/intern/include' incs += ' ' + env['BF_OPENGL_INC'] -env.BlenderLib ( 'blender_radiosity', sources, Split(incs), [], libtype='core', priority=50 ) +env.BlenderLib ( 'bf_radiosity', sources, Split(incs), [], libtype='core', priority=60 ) diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index e1e43eb7830..d06331a5b48 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -11,21 +11,21 @@ incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging' defs = [] if env['WITH_BF_YAFRAY'] == 1: - incs += ' ../yafray' + incs += ' ../yafray' else: - defs.append('DISABLE_YAFRAY') + defs.append('DISABLE_YAFRAY') if env['WITH_BF_QUICKTIME'] == 1: - defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + defs.append('WITH_QUICKTIME') + incs += ' ' + env['BF_QUICKTIME_INC'] if env['WITH_BF_FFMPEG'] == 1: - defs.append('WITH_FFMPEG') + defs.append('WITH_FFMPEG') if env['WITH_BF_OPENEXR']: - defs.append('WITH_OPENEXR') + defs.append('WITH_OPENEXR') if env['OURPLATFORM']=='linux2': - cflags='-pthread' + cflags='-pthread' -env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags ) +env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=55, compileflags=cflags ) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 420cfed426f..e70a7207c11 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -12,4 +12,4 @@ incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' incs += ' #/intern/elbeem' -env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] ) +env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[45, 45] ) |