[Bf-blender-cvs] [ea0e959] soc-2014-fluid: compiling & linking; unused paths deleted; compile flags for manta removed

[Roman Pogribnyi]

Commit: ea0e9598433e8d6eb66eae01a7140196595c662b
Author: Roman Pogribnyi
Date:   Thu Jul 17 15:12:52 2014 +0200
https://developer.blender.org/rBea0e9598433e8d6eb66eae01a7140196595c662b

compiling & linking;  unused paths deleted;  compile flags for manta removed

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/SConscript
M	source/blender/python/SConscript
M	source/blender/python/manta_pp/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 774996e..9696ab3 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -385,12 +385,12 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
-if(WITH_MOD_MANTA)
-	list(APPEND INC
-		../python/manta_pp
-	)
-	add_definitions(-DWITH_MANTA)
-endif()
+#if(WITH_MOD_MANTA)
+#	list(APPEND INC
+#		../python/manta_pp
+#	)
+#	add_definitions(-DWITH_MANTA)
+#endif()
 
 if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 05dd3cf..7558409 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -50,7 +50,7 @@ incs = [
     '#/intern/elbeem/extern',
     '#/intern/iksolver/extern',
     '#/intern/smoke/extern',
-    '#/source/blender/python/manta_pp',
+#   '#/source/blender/python/manta_pp',
     '#/intern/atomic',
     '../avi',
     '../blenfont',
@@ -78,8 +78,8 @@ defs = [
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
     
-if env['WITH_BF_MANTA']:
-    defs.append('WITH_MANTA')
+#if env['WITH_BF_MANTA']:
+#    defs.append('WITH_MANTA')
 
 if env['WITH_BF_FRAMESERVER']:
     defs.append('WITH_FRAMESERVER')
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 64c2c40..a008678 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -80,7 +80,7 @@ env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), inclu
 # manta
 defs = []
 
-sources = env.Glob('manta_pp/*')
+sources = env.Glob('manta_pp/source/*')
 env.BlenderLib( libname = 'bf_python_manta', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'])
 
 
diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_pp/CMakeLists.txt
index 701175c..6f7147b 100755
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -109,7 +109,8 @@ SET(SOURCES
 )
 add_executable(prep ${SOURCES})
 if (NOT WIN32)
-	set_target_properties(prep PROPERTIES COMPILE_FLAGS "-Wall -O2")
+#PR commented
+#	set_target_properties(prep PROPERTIES COMPILE_FLAGS "-Wall -O2")
 endif()
 
 #******************************************************************************
@@ -426,7 +427,7 @@ foreach(it ${PP_HEADERS} ${PP_SOURCES})
 					   COMMAND prep generate ${PP_PREPD} ${MT_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/source/" "${INFILE}" "${CURPP}"
 					   DEPENDS prep
 					   IMPLICIT_DEPENDS CXX ${it}
-					   #WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+#					   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 					   )
 	if ("${CUREXT}" STREQUAL ".h" OR "${CUREXT}" STREQUAL ".py")
 		list(APPEND PP_REGS "${CURPP}.reg")