fix for linking with scons.
This commit is contained in:
parent
5b04685f49
commit
4cacff2342
@ -11,4 +11,4 @@ incs += '../opencl ../nodes ../nodes/intern ../nodes/composite '
|
|||||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||||
incs += ' ' + env['BF_PTHREADS_INC']
|
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] )
|
||||||
|
@ -684,6 +684,8 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void *COM_linker_hack = NULL;
|
||||||
|
|
||||||
void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
|
void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
|
||||||
{
|
{
|
||||||
#ifdef WITH_COMPOSITOR
|
#ifdef WITH_COMPOSITOR
|
||||||
|
@ -199,6 +199,12 @@ void WM_init(bContext *C, int argc, const char **argv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
BLI_strncpy(G.lib, G.main->name, FILE_MAX);
|
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)
|
void WM_init_splash(bContext *C)
|
||||||
|
@ -909,10 +909,9 @@ endif()
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WITH_COMPOSITOR)
|
if(WITH_COMPOSITOR)
|
||||||
#added for opencl compositor
|
# added for opencl compositor
|
||||||
list(APPEND BLENDER_SORTED_LIBS bf_compositor)
|
list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
|
||||||
list(APPEND BLENDER_SORTED_LIBS bf_opencl)
|
list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_opencl")
|
||||||
list(APPEND BLENDER_SORTED_LIBS bf_blenkernel) # hrmf, needed for BKE_mask only
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_LIBMV)
|
if(WITH_LIBMV)
|
||||||
|
Loading…
Reference in New Issue
Block a user