[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48953] trunk/blender/source: fix for linking with scons.

[Campbell Barton]

Revision: 48953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48953
Author:   campbellbarton
Date:     2012-07-16 08:42:55 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
fix for linking with scons.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/SConscript
    trunk/blender/source/blender/nodes/composite/node_composite_tree.c
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/blender/compositor/SConscript
===================================================================
--- trunk/blender/source/blender/compositor/SConscript	2012-07-16 08:26:42 UTC (rev 48952)
+++ trunk/blender/source/blender/compositor/SConscript	2012-07-16 08:42:55 UTC (rev 48953)
@@ -11,4 +11,4 @@
 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] )

Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-07-16 08:26:42 UTC (rev 48952)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-07-16 08:42:55 UTC (rev 48953)
@@ -684,6 +684,8 @@
 }
 #endif
 
+void *COM_linker_hack = NULL;
+
 void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
 {
 #ifdef WITH_COMPOSITOR

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-07-16 08:26:42 UTC (rev 48952)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-07-16 08:42:55 UTC (rev 48953)
@@ -199,6 +199,12 @@
 #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)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-07-16 08:26:42 UTC (rev 48952)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-07-16 08:42:55 UTC (rev 48953)
@@ -909,10 +909,9 @@
 	)
 
 	if(WITH_COMPOSITOR)
-		#added for opencl compositor
-		list(APPEND BLENDER_SORTED_LIBS bf_compositor)
-		list(APPEND BLENDER_SORTED_LIBS bf_opencl)
-		list(APPEND BLENDER_SORTED_LIBS bf_blenkernel)  # hrmf, needed for BKE_mask only
+		# added for opencl compositor
+		list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
+		list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_opencl")
 	endif()
 
 	if(WITH_LIBMV)