diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-09-05 10:05:25 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-09-05 10:05:25 +0400 |
commit | 18fe6c27ff2b4a76ec5c646a3dda0a7bd64d94b4 (patch) | |
tree | 4d274bf759cb3f65bff2e1e5906784667f228e21 /source/blender/blenlib/SConscript | |
parent | 18b5b4ff0c270c328f0fe30e0af9a7ff178247eb (diff) |
Compiling/Warning Fixes (for scons/mingw + "split sources hack") Part 1:
* Removed compiler warnings from texteditor work
* Added round brackets around the new defines for IPO channels for extra texture layers
* Tweaked priorities so that BLI_heap_* functions in blenlib can be found by linker (split-sources specific)
TODO:
* "monkey*" vars cannot be found still
Diffstat (limited to 'source/blender/blenlib/SConscript')
-rw-r--r-- | source/blender/blenlib/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 649d3cb5659..65cebf02f62 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -24,4 +24,4 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): 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', 'intern', 'player'], priority = [85,150,195], compileflags =cflags ) |