[Bf-blender-cvs] [1af573b] fluid-mantaflow: configured CMake and includes to use new manta api

[Sebastián Barschkis]

Commit: 1af573bb4891c07a3164a008854b33ce8dc77a96
Author: Sebastián Barschkis
Date:   Thu Mar 17 09:32:01 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB1af573bb4891c07a3164a008854b33ce8dc77a96

configured CMake and includes to use new manta api

===================================================================

M	build_files/cmake/macros.cmake
M	intern/smoke/CMakeLists.txt
M	source/blender/python/intern/bpy_interface.c
M	source/blender/python/manta_pp/CMakeLists.txt
M	source/blenderplayer/CMakeLists.txt
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index b8820b4..a53d141 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -562,7 +562,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_render
 		bf_python
 		bf_python_ext
-#		bf_python_manta # configured separately in source/creator/CMakeLists.txt 
 		bf_python_mathutils
 		bf_python_bmesh
 		bf_freestyle
@@ -596,6 +595,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		ge_phys_dummy
 		ge_phys_bullet
 		bf_intern_smoke
+#		bf_intern_mantaflow # configured separately in source/creator/CMakeLists.txt
 		extern_lzma
 		ge_logic_ketsji
 		extern_recastnavigation
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 662b47d..a9c5899 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -110,5 +110,5 @@ if(WITH_FFTW3)
 	)
 endif()
 
-blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
+#blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 7e33a2d..beee692 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -79,7 +79,7 @@
 #include "../bmesh/bmesh_py_api.h"
 #include "../mathutils/mathutils.h"
 
-#include "../manta_pp/pwrapper/manta_api.h"
+#include "../../../../intern/mantaflow/extern/manta_python_api.h"
 
 
 /* for internal use, when starting and ending python scripts */
@@ -274,7 +274,6 @@ void BPY_python_start(int argc, const char **argv)
 #endif
 
 	Py_FrozenFlag = 1;
-//	PyImport_AppendInittab("manta", PyInit_Manta);
 	Py_Initialize();
 
 	// PySys_SetArgv(argc, argv);  /* broken in py3, not a huge deal */
diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_pp/CMakeLists.txt
index b655485..0fb2809 100644
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -141,4 +141,4 @@ ${CMAKE_CURRENT_SOURCE_DIR}/util/simpleimage.h
 list(REMOVE_DUPLICATES "SRC")
 list_assert_duplicates("${SRC}")
 
-blender_add_lib(bf_python_manta "${SRC}" "${INC}" "${INC_SYS}")
+#blender_add_lib(bf_python_manta "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 6ecd16d..e3fe66b 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -130,6 +130,7 @@ endif()
 		bf_intern_itasc
 		bf_intern_iksolver
 		bf_intern_smoke
+		bf_intern_mantaflow
 		bf_modifiers
 		bf_intern_moto 
 		bf_nodes
@@ -143,7 +144,6 @@ endif()
 		bf_intern_guardedalloc 
 		bf_intern_memutil 
 		bf_python_ext
-		bf_python_manta
 		bf_python_mathutils
 		bf_python_bmesh
 		bf_intern_utfconv
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 31edec0..cfa5b23 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1054,12 +1054,10 @@ setup_blender_sorted_libs()
 
 # -----------------------------------------------------------------------------
 # Mantaflow Force linking
-#PR removed -Wl, -force_load 
-#SET(MANTA_LINK_LIBRARIES -rdynamic -Wl,-force_load bf_python_manta) 
 if(APPLE)
-	SET(MANTA_LINK_LIBRARIES -force_load bf_python_manta ) 
+	SET(MANTA_LINK_LIBRARIES -force_load bf_intern_mantaflow )
 else()
-	SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_python_manta -Wl,--no-whole-archive )
+	SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_intern_mantaflow -Wl,--no-whole-archive )
 endif()
 target_link_libraries(blender ${MANTA_LINK_LIBRARIES})