[Bf-blender-cvs] [a70e439] soc-2014-fluid: removed pp files, preproessing during compiling step

Roman Pogribnyi noreply at git.blender.org
Mon Jul 14 12:58:51 CEST 2014 

Commit: a70e4394acce14e6190b93e85f09a51b04525a9e
Author: Roman Pogribnyi
Date:   Mon Jul 14 12:57:43 2014 +0200
https://developer.blender.org/rBa70e4394acce14e6190b93e85f09a51b04525a9e

removed pp files, preproessing during compiling step

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

M	CMakeLists.txt
M	intern/smoke/intern/MANTA.h
M	source/blender/python/intern/bpy_interface.c
M	source/blender/python/manta_pp/CMakeLists.txt
A	source/blender/python/manta_pp/COPYING
A	source/blender/python/manta_pp/Doxyfile.in
A	source/blender/python/manta_pp/INSTALLING
D	source/blender/python/manta_pp/SConscript
D	source/blender/python/manta_pp/commonkernels.h
D	source/blender/python/manta_pp/commonkernels.h.reg
D	source/blender/python/manta_pp/commonkernels.h.reg.cpp
D	source/blender/python/manta_pp/conjugategrad.cpp
D	source/blender/python/manta_pp/conjugategrad.h
D	source/blender/python/manta_pp/conjugategrad.h.reg
D	source/blender/python/manta_pp/conjugategrad.h.reg.cpp
D	source/blender/python/manta_pp/cuda/buoyancy.cu
D	source/blender/python/manta_pp/cuda/cudatools.h
D	source/blender/python/manta_pp/cuda/curlnoise.cu
D	source/blender/python/manta_pp/cuda/curlnoise.h
D	source/blender/python/manta_pp/cuda/meshtools.cu
D	source/blender/python/manta_pp/cuda/particle.cu
D	source/blender/python/manta_pp/cuda/turbulence.cu
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/adler32.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/compress.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/crc32.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/deflate.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzclose.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzguts.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzlib.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzread.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/gzwrite.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/infback.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffast.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inffixed.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inflate.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/inftrees.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/trees.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/uncompr.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zconf.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zlib.h
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zutil.c
A	source/blender/python/manta_pp/dependencies/zlib-1.2.8/zutil.h
D	source/blender/python/manta_pp/edgecollapse.cpp
D	source/blender/python/manta_pp/edgecollapse.h
D	source/blender/python/manta_pp/edgecollapse.h.reg
D	source/blender/python/manta_pp/edgecollapse.h.reg.cpp
D	source/blender/python/manta_pp/fastmarch.cpp
D	source/blender/python/manta_pp/fastmarch.h
D	source/blender/python/manta_pp/fastmarch.h.reg
D	source/blender/python/manta_pp/fastmarch.h.reg.cpp
D	source/blender/python/manta_pp/fileio.cpp
D	source/blender/python/manta_pp/fileio.h
D	source/blender/python/manta_pp/fileio.h.reg
D	source/blender/python/manta_pp/fileio.h.reg.cpp
D	source/blender/python/manta_pp/flip.cpp
D	source/blender/python/manta_pp/flip.h
D	source/blender/python/manta_pp/flip.h.reg
D	source/blender/python/manta_pp/flip.h.reg.cpp
D	source/blender/python/manta_pp/fluidsolver.cpp
D	source/blender/python/manta_pp/fluidsolver.h
D	source/blender/python/manta_pp/fluidsolver.h.reg
D	source/blender/python/manta_pp/general.cpp
D	source/blender/python/manta_pp/general.h.reg
D	source/blender/python/manta_pp/general.h.reg.cpp
D	source/blender/python/manta_pp/grid.cpp
D	source/blender/python/manta_pp/grid.h
D	source/blender/python/manta_pp/grid.h.reg
D	source/blender/python/manta_pp/grid.h.reg.cpp
D	source/blender/python/manta_pp/gui/customctrl.cpp
D	source/blender/python/manta_pp/gui/customctrl.h
D	source/blender/python/manta_pp/gui/customctrl.h.reg
D	source/blender/python/manta_pp/gui/customctrl.h.reg.cpp
D	source/blender/python/manta_pp/gui/glwidget.cpp
D	source/blender/python/manta_pp/gui/glwidget.h
D	source/blender/python/manta_pp/gui/glwidget.h.reg
D	source/blender/python/manta_pp/gui/glwidget.h.reg.cpp
D	source/blender/python/manta_pp/gui/mainwindow.cpp
D	source/blender/python/manta_pp/gui/mainwindow.h
D	source/blender/python/manta_pp/gui/mainwindow.h.reg
D	source/blender/python/manta_pp/gui/mainwindow.h.reg.cpp
D	source/blender/python/manta_pp/gui/meshpainter.cpp
D	source/blender/python/manta_pp/gui/meshpainter.h
D	source/blender/python/manta_pp/gui/meshpainter.h.reg
D	source/blender/python/manta_pp/gui/meshpainter.h.reg.cpp
D	source/blender/python/manta_pp/gui/moc_customctrl.cxx
D	source/blender/python/manta_pp/gui/moc_customctrl.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_glwidget.cxx
D	source/blender/python/manta_pp/gui/moc_glwidget.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_mainwindow.cxx
D	source/blender/python/manta_pp/gui/moc_mainwindow.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_meshpainter.cxx
D	source/blender/python/manta_pp/gui/moc_meshpainter.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_painter.cxx
D	source/blender/python/manta_pp/gui/moc_painter.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_particlepainter.cxx
D	source/blender/python/manta_pp/gui/moc_particlepainter.cxx_parameters
D	source/blender/python/manta_pp/gui/moc_qtmain.cxx
D	source/blender/python/manta_pp/gui/moc_qtmain.cxx_parameters
D	source/blender/python/manta_pp/gui/painter.cpp
D	source/blender/python/manta_pp/gui/painter.h
D	source/blender/python/manta_pp/gui/painter.h.reg
D	source/blender/python/manta_pp/gui/painter.h.reg.cpp
D	source/blender/python/manta_pp/gui/particlepainter.cpp
D	source/blender/python/manta_pp/gui/particlepainter.h
D	source/blender/python/manta_pp/gui/particlepainter.h.reg
D	source/blender/python/manta_pp/gui/particlepainter.h.reg.cpp
D	source/blender/python/manta_pp/gui/qtmain.cpp
D	source/blender/python/manta_pp/gui/qtmain.h
D	source/blender/python/manta_pp/gui/qtmain.h.reg
D	source/blender/python/manta_pp/gui/qtmain.h.reg.cpp
D	source/blender/python/manta_pp/hginfo.h
D	source/blender/python/manta_pp/kernel.cpp
D	source/blender/python/manta_pp/kernel.h
D	source/blender/python/manta_pp/kernel.h.reg
D	source/blender/python/manta_pp/kernel.h.reg.cpp
D	source/blender/python/manta_pp/levelset.cpp
D	source/blender/python/manta_pp/levelset.h
D	source/blender/python/manta_pp/levelset.h.reg
D	source/blender/python/manta_pp/levelset.h.reg.cpp
D	source/blender/python/manta_pp/manta.h
D	source/blender/python/manta_pp/mesh.cpp
D	source/blender/python/manta_pp/mesh.h
D	source/blender/python/manta_pp/mesh.h.reg
D	source/blender/python/manta_pp/mesh.h.reg.cpp
D	source/blender/python/manta_pp/movingobs.cpp
D	source/blender/python/manta_pp/movingobs.h
D	source/blender/python/manta_pp/movingobs.h.reg
D	source/blender/python/manta_pp/movingobs.h.reg.cpp
D	source/blender/python/manta_pp/noisefield.cpp
D	source/blender/python/manta_pp/noisefield.h
D	source/blender/python/manta_pp/noisefield.h.reg
D	source/blender/python/manta_pp/noisefield.h.reg.cpp
D	source/blender/python/manta_pp/particle.cpp
D	source/blender/python/manta_pp/particle.h
D	source/blender/python/manta_pp/particle.h.reg
D	source/blender/python/manta_pp/particle.h.reg.cpp
D	source/blender/python/manta_pp/plugin/advection.cpp
D	source/blender/python/manta_pp/plugin/extforces.cpp
D	source/blender/python/manta_pp/plugin/initplugins.cpp
D	source/blender/python/manta_pp/plugin/kepsilon.cpp
D	source/blender/python/manta_pp/plugin/meshplugins.cpp
D	source/blender/python/manta_pp/plugin/pressure.cpp
D	source/blender/python/manta_pp/plugin/vortexplugins.cpp
D	source/blender/python/manta_pp/plugin/waveletturbulence.cpp
D	source/blender/python/manta_pp/preprocessor/code.cpp
D	source/blender/python/manta_pp/preprocessor/code.h
D	source/blender/python/manta_pp/preprocessor/codegen_kernel.cpp
D	source/blender/python/manta_pp/preprocessor/codegen_python.cpp
D	source/blender/python/manta_pp/preprocessor/main.cpp
D	source/blender/python/manta_pp/preprocessor/main.h
D	source/blender/python/manta_pp/preprocessor/merge.cpp
D	source/blender/python/manta_pp/preprocessor/parse.cpp
D	source/blender/python/manta_pp/preprocessor/prep.h
D	source/blender/python/manta_pp/preprocessor/tokenize.cpp
D	source/blender/python/manta_pp/preprocessor/tokenize.h
D	source/blender/python/manta_pp/preprocessor/util.cpp
D	source/blender/python/manta_pp/preprocessor/util.h
D	source/blender/python/manta_pp/pwrapper/manta.h
D	source/blender/python/manta_pp/pwrapper/manta_api.cpp
D	source/blender/python/manta_pp/pwrapper/manta_api.h
D	source/blender/python/manta_pp/pwrapper/pclass.cpp
D	source/blender/python/manta_pp/pwrapper/pclass.h
D	source/blender/python/manta_pp/pwrapper/pconvert.cpp
D	source/blender/python/manta_pp/pwrapper/pconvert.h
D	source/blender/python/manta_pp/pwrapper/pvec3.cpp
D	source/blender/python/manta_pp/pwrapper/pymain.cpp
D	source/blender/python/manta_pp/pwrapper/pymain.h
D	source/blender/python/manta_pp/pwrapper/pythonInclude.h
D	source/blender/python/manta_pp/pwrapper/registry.cpp
D	source/blender/python/manta_pp/pwrapper/registry.h
D	source/blender/python/manta_pp/python/defines.py
D	source/blender/python/manta_pp/python/defines.py.reg
D	source/blender/python/manta_pp/python/defines.py.reg.cpp
A	source/blender/python/manta_pp/resources/pause.png
A	source/blender/python/manta_pp/resources/play.png
A	source/blender/python/manta_pp/resources/res.qrc
A	source/blender/python/manta_pp/resources/stop.png
A	source/blender/python/manta_pp/scenes/simpleplume.py
D	source/blender/python/manta_pp/shapes.cpp
D	source/blender/python/manta_pp/shapes.h
D	source/blender/python/manta_pp/shapes.h.reg
D	source/blender/python/manta_pp/shapes.h.reg.cpp
A	source/blender/python/manta_pp/source/advection.cpp
A	source/blender/python/manta_pp/source/cmake/FindTBB.cmake
A	source/blender/python/manta_pp/source/commonkernels.h
A	source/blender/python/manta_pp/source/conjugategrad.cpp
A	source/blender/python/manta_pp/source/conjugategrad.h
A	source/blender/python/manta_pp/source/cuda/buoyancy.cu
A	source/blender/python/manta_pp/source/cuda/cudatools.h
A	source/blender/python/manta_pp/source/cuda/curlnoise.cu
A	source/blender/python/manta_pp/source/cuda/curlnoise.h
A	source/blender/python/manta_pp/source/cuda/meshtools.cu
A	source/blender/python/manta_pp/source/cuda/particle.cu
A	source/blender/python/manta_pp/source/cuda/turbulence.cu
A	source/blender/python/manta_pp/source/edgecollapse.cpp
A	source/blender/python/manta_pp/source/edgecollapse.h
A	source/blender/python/manta_pp/source/extforces.cpp
A	source/blender/python/manta_pp/source/fastmarch.cpp
A	source/blender/python/manta_pp/source/fastmarch.h
A	source/blender/python/manta_pp/source/fileio.cpp
A	source/blender/python/manta_pp/source/fileio.h
A	source/blender/python/manta_pp/source/flip.cpp
A	source/blender/python/manta_pp/source/flip.h
A	source/blender/python/manta_pp/source/fluidsolver.cpp
A	source/blender/python/manta_pp/source/fluidsolver.h
A	source/blender/python/manta_pp/source/general.cpp
A	source/blender/python/manta_pp/source/general.h
A	source/blender/python/manta_pp/source/grid.cpp
A	source/blender/python/manta_pp/source/grid.h
A	source/blender/python/manta_pp/source/gui/customctrl.cpp
A	source/blender/python/manta_pp/source/gui/customctrl.h
A	source/blender/python/manta_pp/source/gui/glwidget.cpp
A	source/blender/python/manta_pp/source/gui/glwidget.h
A	source/blender/python/manta_pp/source/gui/mainwindow.cpp
A	source/blender/python/manta_pp/source/gui/mainwindow.h
A	source/blender/python/manta_pp/source/gui/meshpainter.cpp
A	source/blender/python/manta_pp/source/gui/meshpainter.h
A	source/blender/python/manta_pp/source/gui/painter.cpp
A	source/blender/python/manta_pp/source/gui/painter.h
A	source/blender/python/manta_pp/source/gui/particlepainter.cpp
A	source/blender/python/manta_pp/source/gui/particlepainter.h
A	source/blender/python/manta_pp/source/gui/qtmain.cpp
A	source/blender/python/manta_pp/source/gui/qtmain.h
A	source/blender/python/manta_pp/source/initplugins.cpp
A	source/blender/python/manta_pp/source/kepsilon.cpp
A	source/blender/python/manta_pp/source/kernel.cpp
A	source/blender/python/manta_pp/source/kernel.h
A	source/blender/python/manta_pp/source/levelset.cpp
A	source/blender/python/manta_pp/source/levelset.h
A	source/blender/python/manta_pp/source/mesh.cpp
A	source/blender/python/manta_pp/source/mesh.h
A	source/blender/python/manta_pp/source/meshplugins.cpp
A	source/blender/python/manta_pp/source/movingobs.cpp
A	source/blender/python/manta_pp/source/movingobs.h
A	source/blender/python/manta_pp/source/noisefield.cpp
A	source/blender/python/manta_pp/source/noisefield.h
A	source/blender/python/manta_pp/source/particle.cpp
A	source/blender/python/manta_pp/source/particle.h
A	source/blender/python/manta_pp/source/plugin/advection.cpp
A	source/blender/python/manta_pp/source/plugin/extforces.cpp
A	source/blender/python/manta_pp/source/plugin/initplugins.cpp
A	source/blender/python/manta_pp/source/plugin/kepsilon.cpp
A	source/blender/python/manta_pp/source/plugin/meshplugins.cpp
A	source/blender/python/manta_pp/source/plugin/pressure.cpp
A	source/blender/python/manta_pp/source/plugin/vortexplugins.cpp
A	source/blender/python/manta_pp/source/plugin/waveletturbulence.cpp
A	source/blender/python/manta_pp/source/preprocessor/code.cpp
A	source/blender/python/manta_pp/source/preprocessor/code.h
A	source/blender/python/manta_pp/source/preprocessor/codegen_kernel.cpp
A	source/blender/python/manta_pp/source/preprocessor/codegen_python.cpp
A	source/blender/python/manta_pp/source/preprocessor/main.cpp
A	source/blender/python/manta_pp/source/preprocessor/merge.cpp
A	source/blender/python/manta_pp/source/preprocessor/parse.cpp
A	source/blender/python/manta_pp/source/preprocessor/prep.h
A	source/blender/python/manta_pp/source/preprocessor/tokenize.cpp
A	source/blender/python/manta_pp/source/preprocessor/tokenize.h
A	source/blender/python/manta_pp/source/preprocessor/util.cpp
A	source/blender/python/manta_pp/source/preprocessor/util.h
A	source/blender/python/manta_pp/source/pressure.cpp
A	source/blender/python/manta_pp/source/pwrapper/manta.h
A	source/blender/python/manta_pp/source/pwrapper/manta_api.cpp
A	source/blender/python/manta_pp/source/pwrapper/manta_api.h
A	source/blender/python/manta_pp/source/pwrapper/pclass.cpp
A	source/blender/python/manta_pp/source/pwrapper/pclass.h
A	source/blender/python/manta_pp/source/pwrapper/pconvert.cpp
A	source/blender/python/manta_pp/source/pwrapper/pconvert.h
A	source/blender/python/manta_pp/source/pwrapper/pvec3.cpp
A	source/blender/python/manta_pp/source/pwrapper/pymain.cpp
A	source/blender/python/manta_pp/source/pwrapper/pymain.h
A	source/blender/python/manta_pp/source/pwrapper/pythonInclude.h
A	source/blender/python/manta_pp/source/pwrapper/registry.cpp
A	source/blender/python/manta_pp/source/pwrapper/registry.h
A	source/blender/python/manta_pp/source/python/defines.py
A	source/blender/python/manta_pp/source/shapes.cpp
A	source/blender/python/manta_pp/source/shapes.h
A	source/blender/python/manta_pp/source/test.cpp
A	source/blender/python/manta_pp/source/turbulencepart.cpp
A	source/blender/python/manta_pp/source/turbulencepart.h
A	source/blender/python/manta_pp/source/util/integrator.h
A	source/blender/python/manta_pp/source/util/interpol.h
A	source/blender/python/manta_pp/source/util/interpolHigh.h
A	source/blender/python/manta_pp/source/util/mcubes.h
A	source/blender/python/manta_pp/source/util/quaternion.h
A	source/blender/python/manta_pp/source/util/randomstream.h
A	source/blender/python/manta_pp/source/util/solvana.h
A	source/blender/python/manta_pp/source/util/vectorbase.cpp
A	source/blender/python/manta_pp/source/util/vectorbase.h
A	source/blender/python/manta_pp/source/vortexfilament.cpp
A	source/blender/python/manta_pp/source/vortexfilament.h
A	source/blender/python/manta_pp/source/vortexpart.cpp
A	source/blender/python/manta_pp/source/vortexpart.h
A	source/blender/python/manta_pp/source/vortexplugins.cpp
A	source/blender/python/manta_pp/source/vortexsheet.cpp
A	source/blender/python/manta_pp/source/vortexsheet.h
A	source/blender/python/manta_pp/source/waveletturbulence.cpp
D	source/blender/python/manta_pp/test.cpp
D	source/blender/python/manta_pp/turbulencepart.cpp
D	source/blender/python/manta_pp/turbulencepart.h
D	source/blender/python/manta_pp/turbulencepart.h.reg
D	source/blender/python/manta_pp/turbulencepart.h.reg.cpp
D	source/blender/python/manta_pp/util/integrator.h
D	source/blender/python/manta_pp/util/interpol.h
D	source/blender/python/manta_pp/util/interpolHigh.h
D	source/blender/python/manta_pp/util/mcubes.h
D	source/blender/python/manta_pp/util/quaternion.h
D	source/blender/python/manta_pp/util/randomstream.h
D	source/blender/python/manta_pp/util/solvana.h
D	source/blender/python/manta_pp/util/vectorbase.cpp
D	source/blender/python/manta_pp/util/vectorbase.h
D	source/blender/python/manta_pp/vortexfilament.cpp
D	source/blender/python/manta_pp/vortexfilament.h
D	source/blender/python/manta_pp/vortexpart.cpp
D	source/blender/python/manta_pp/vortexpart.h
D	source/blender/python/manta_pp/vortexpart.h.reg
D	source/blender/python/manta_pp/vortexpart.h.reg.cpp
D	source/blender/python/manta_pp/vortexsheet.cpp
D	source/blender/python/manta_pp/vortexsheet.h
D	source/blender/python/manta_pp/vortexsheet.h.reg
D	source/blender/python/manta_pp/vortexsheet.h.reg.cpp

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c1673e..05a8c99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2090,29 +2090,31 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure mantaflow.
 
+
 #if(WITH_MOD_MANTA)
+#	message("including manta")
 #	include(ExternalProject)
 #	set(QT_QMAKE_EXECUTABLE /usr/bin/qmake-4.8)
 #	#set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src")
 #	ExternalProject_Add(
- # 	MantaFlow
+# 	MantaFlow
 #   	CVS_MODULE CMake
-#   	CVS_TAG -r CMake-2-6-4
-#   	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:
-#       PATH=<INSTALL_DIR>
-#	CMAKE_ARGS  -DGUI=OFF
-#				-DPREPDEBUG=OFF
+##  	CVS_TAG -r CMake-2-6-4
+#   	#CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:
+#    #   PATH=<INSTALL_DIR>
+#	#CMAKE_ARGS  -DGUI=OFF
+#	#			-DPREPDEBUG=ON
 # 	UPDATE_COMMAND ""
 #   	DOWNLOAD_COMMAND ""
 #   	INSTALL_COMMAND ""
-#  	SOURCE_DIR ${CMAKE_SOURCE_DIR}/extern/manta
+#  	SOURCE_DIR ${CMAKE_SOURCE_DIR}/source/blender/python/manta_pp
 #)
 #ExternalProject_Add_Step(MantaFlow forceconfigure
 #            COMMAND ${CMAKE_COMMAND} -E echo "Force configure of MantaFlow"
 #            DEPENDEES update
 #            DEPENDERS configure
-#            ALWAYS 1)
-#set_target_properties(MantaFlow PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+#            ALWAYS 0)
+##set_target_properties(MantaFlow PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 #endif()
 
 #-----------------------------------------------------------------------------
diff --git a/intern/smoke/intern/MANTA.h b/intern/smoke/intern/MANTA.h
index 14e5788..3d70491 100644
--- a/intern/smoke/intern/MANTA.h
+++ b/intern/smoke/intern/MANTA.h
@@ -10,7 +10,8 @@
 #include <fstream>
 #include <pthread.h>
 #include <Python.h>
-#include "../../../source/blender/python/manta_pp/pwrapper/pymain.cpp"
+#include <vector>
+//#include "../../../source/blender/python/manta_pp/source/pwrapper/pymain.cpp"
 extern "C" bool manta_check_grid_size(struct FLUID_3D *fluid, int dimX, int dimY, int dimZ)
 {
 	if (!(dimX == fluid->xRes() && dimY == fluid->yRes() && dimZ == fluid->zRes())) {
@@ -174,7 +175,7 @@ void run_manta_scene()
 	args.push_back("manta_scene.py");
 	//args.push_back("test_1.py");
 	
-	runScript(args);
+//	runScript(args);
 	 
 	//system("./manta manta_scene.py");
 //	pthread_exit(NULL);
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 6e5593f..1709862 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -82,7 +82,7 @@
 #include "../bmesh/bmesh_py_api.h"
 #include "../mathutils/mathutils.h"
 
-#include "../manta_pp/pwrapper/manta_api.h"
+#include "../manta_pp/source/pwrapper/manta_api.h"
 
 
 /* for internal use, when starting and ending python scripts */
@@ -273,7 +273,7 @@ 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
old mode 100644
new mode 100755
index 0d0afc3..7963ace
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -1,459 +1,579 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
+#******************************************************************************
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# MantaFlow fluid solver framework
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright 2011-2014 Tobias Pfaff, Nils Thuerey 
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# This program is free software, distributed under the terms of the
+# GNU General Public License (GPL) 
+# http://www.gnu.org/licenses
 #
-# The Original Code is Copyright (C) 2012, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): .
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
-	cuda
-	preprocessor
-	pwrapper
-	python
-	plugin
-	util
+#******************************************************************************
+
+project (MantaFlow)
+cmake_minimum_required(VERSION 2.8) # 2.8 needed for CUDA
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/source/cmake/")
+SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+SET(VERBOSE 1) 
+
+SET(MANTAVERSION "0.6")
+
+#******************************************************************************
+# Default paths
+# - CMake's path finder is completely useless for Qt5 + Python on Win64
+
+IF(WIN32)
+	set(WIN_QT_PATH "C:/Qt/Qt5.2.1/5.2.1/msvc2012_64_opengl") # qt5/win64
+	# set(WIN_QT_PATH "C:/Qt/4.8.6") # qt4/win32
+	set(WIN_PYTHON_PATH "C:/Python34")
+	set(WIN_PYTHON_VERSION "34")
+	set(CMAKE_LIBRARY_PATH "C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64")
+	SET(CMAKE_PREFIX_PATH ${WIN_QT_PATH})
+ENDIF()
+
+IF(APPLE)
+	SET(CMAKE_PREFIX_PATH "/usr/local/Cellar/qt5/5.2.1/") #  mac/homebrew
+ENDIF()
+
+#******************************************************************************
+# setup default params
+
+IF(NOT CMAKE_BUILD_TYPE) 
+	SET(CMAKE_BUILD_TYPE "Debug") 
+ELSE()
+	MESSAGE("Build-type: '${CMAKE_BUILD_TYPE}'")
+ENDIF()
+
+# compilation versions
+OPTION(DEBUG "Enable debug compilation" OFF)
+OPTION(GUI "Compile with GUI (requires QT)" OFF)
+OPTION(TBB "Use multi-thread kernels using Intels TBB" OFF)
+OPTION(OPENMP "Use multi-thread kernels using OpenMP" OFF)
+OPTION(CUDA "Compile with CUDA plugins" OFF)
+OPTION(PREPDEBUG "Debug generated files" OFF) # This will beautify generated files, and link to them for compiler errors instead of the original sources
+OPTION(DOUBLEPRECISION "Compile with double floating point precision" OFF)
+
+#check consistency of MT options
+set(MT OFF)
+set(MT_TYPE "NONE")
+if (TBB)
+	set (MT_TYPE "TBB")
+	set (MT ON)
+endif()
+if (OPENMP)
+	set (MT_TYPE "OPENMP")
+	set (MT ON)
+endif()
+if (TBB AND OPENMP)
+	message(FATAL_ERROR "Cannot activate both OPENMP and TBB")
+endif()
+
+# make sure debug settings match...
+IF(NOT DEBUG)
+	IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+		SET(DEBUG 1) 
+	ENDIF()
+ENDIF()
+IF(DEBUG)
+	SET(CMAKE_BUILD_TYPE "Debug")
+	add_definitions ( -DDEBUG )
+ENDIF()
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "Options - "
+	" -DDEBUG='${DEBUG}' "
+	" -DGUI='${GUI}' "
+	" -DTBB='${TBB}' "
+	" -DOPENMP='${OPENMP}' "
+	" -DPREPDEBUG='${PREPDEBUG}' "
+	" -DCUDA='${CUDA}' "
+	" -DDOUBLEPRECISION='${DOUBLEPRECISION}' "
+	)
+MESSAGE(STATUS "Multithreading type : ${MT_TYPE}")
+MESSAGE(STATUS "")
+
+#******************************************************************************
+# Pre-processor
+
+# compile prep
+SET(SOURCES 
+	source/preprocessor/main.cpp
+	source/preprocessor/code.cpp
+	source/preprocessor/tokenize.cpp
+	source/preprocessor/parse.cpp
+	source/preprocessor/util.cpp
+	source/preprocessor/merge.cpp
+	source/preprocessor/codegen_python.cpp
+	source/preprocessor/codegen_kernel.cpp    
 )
+add_executable(prep ${SOURCES})
+if (NOT WIN32)
+	set_target_properties(prep PROPERTIES COMPILE_FLAGS "-Wall -O2")
+endif()
 
-set(INC_SYS
-	${PYTHON_INCLUDE_DIRS}
+#******************************************************************************
+# Setup main project
+
+SET(F_LIBS "" )
+SET(F_LIB_PATHS)
+SET(F_LINKADD "") # additional linker flags, not a list
+set(PP_PATH "pp")
+SET(SILENT_SOURCES)
+
+# need pre-processing
+SET(PP_SOURCES
+	source/fluidsolver.cpp
+	source/conjugategrad.cpp
+	source/grid.cpp
+	source/levelset.cpp
+	source/fastmarch.cpp
+	source/shapes.cpp
+	source/mesh.cpp
+	source/general.cpp
+	source/particle.cpp
+	source/flip.cpp
+	source/movingobs.cpp
+	source/fileio.cpp   
+	source/noisefield.cpp
+	source/kernel.cpp
+	source/vortexsheet.cpp
+	#source/vortexfilament.cpp
+	source/vortexpart.cpp
+	source/turbulencepart.cpp
+	source/edgecollapse.cpp
+	
+	source/pressure.cpp
+	source/initplugins.cpp
+	source/advection.cpp
+	source/extforces.cpp
+	source/kepsilon.cpp
+	source/meshplugins.cpp
+	source/vortexplugins.cpp
+	source/waveletturbulence.cpp
+	
+	source/python/defines.py
+	source/test.cpp
 )
-#blender_include_dirs_sys("${PYTHON_INCLUDE_DIRS}")
-add_definitions(-DWITH_PYTHON)
 
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+SET(PP_HEADERS
+	source/commonkernels.h
+	source/conjugategrad.h
+	source/fastmarch.h
+	source/fluidsolver.h
+	source/grid.h
+	source/mesh.h
+	source/particle.h
+	source/levelset.h
+	source/shapes.h
+	source/noisefield.h
+	source/vortexsheet.h
+	#source/vortexfilament.h
+	source/general.h
+	source/kernel.h
+	source/flip.h
+	source/movingobs.h
+	source/fileio.h
+	source/edgecollapse.h
+	source/vortexpart.h
+	source/turbulencepart.h
+	#source/test.h    
+)
 
+# no pre-processing needed
+set(NOPP_SOURCES
+	source/pwrapper/pymain.cpp
+	source/pwrapper/pclass.cpp
+	source/pwrapper/pvec3.cpp
+	source/pwrapper/pconvert.cpp
+	source/pwrapper/registry.cpp
+	source/util/vectorbase.cpp
+	source/pwrapper/manta_api.cpp
+)
+ 
+SET(NOPP_HEADERS
+	source/pwrapper/pythonInclude.h
+	source/pwrapper/pclass.h
+	source/pwrapper/registry.h
+	source/pwrapper/pconvert.h
+	source/util/integrator.h
+	source/util/vectorbase.h
+	source/util/quaternion.h
+	source/util/interpol.h
+	source/util/mcubes.h
+	source/util/randomstream.h
+	source/util/solvana.h    
+	source/pwrapper/manta_api.h
+)
 
-if(WITH_PYTHON_MODULE)
-	add_definitions(-DWITH_PYTHON_MODULE)
+if (GUI)
+	# need QT preprocessor
+	set(QT_HEADERS 
+		source/gui/mainwindow.h
+		source/gui/glwidget.h
+		source/gui/painter.h
+		source/gui/meshpainter.h
+		source/gui/qtmain.h 
+		source/gui/custo

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list