diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-16 12:42:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-16 12:42:55 +0400 |
| commit | 4cacff234225d81c44144551fd295a24a9b3c30c (patch) | |
| tree | e00a85ad303c1488bdd5779bccb2069f4bd9c909 /source/blender | |
| parent | 5b04685f49d13f58b4b6159d6bd6d6f970bc56bb (diff) | |
fix for linking with scons.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/compositor/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript index af0d4109acc..d7f18cfa436 100644 --- a/source/blender/compositor/SConscript +++ b/source/blender/compositor/SConscript @@ -11,4 +11,4 @@ incs += '../opencl ../nodes ../nodes/intern ../nodes/composite ' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( 'bf_composite', sources, Split(incs), defines=defs, libtype=['core'], priority = [191] ) +env.BlenderLib ( 'bf_composite', sources, Split(incs), defines=defs, libtype=['core'], priority = [164] ) diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 43edc06194d..18ab3b7d6d1 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -684,6 +684,8 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr } #endif +void *COM_linker_hack = NULL; + void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview) { #ifdef WITH_COMPOSITOR diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 3dbb3b7ef66..b9170d703aa 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -199,6 +199,12 @@ void WM_init(bContext *C, int argc, const char **argv) #endif BLI_strncpy(G.lib, G.main->name, FILE_MAX); + + if (1) { + extern void *COM_linker_hack; + extern void *COM_execute; + COM_linker_hack = COM_execute; + } } void WM_init_splash(bContext *C) |