Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-12-31 07:34:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-31 07:34:44 +0400
commitba8d1b940f1b462dd86f01dfb88478b64572a258 (patch)
tree3cc5f0770370418608f2d51fc6b4a66735d6aea3 /intern
parent65c74f1570b845ea3be9fc17bec2655392ca38f8 (diff)
option to build without remesh modifier for cmake and scons
Diffstat (limited to 'intern')
-rw-r--r--intern/CMakeLists.txt5
-rw-r--r--intern/SConscript4
2 files changed, 7 insertions, 2 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 3332d1c97e7..9f5217e68e3 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -31,12 +31,15 @@ add_subdirectory(memutil)
add_subdirectory(iksolver)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
-add_subdirectory(dualcon)
if(WITH_AUDASPACE)
add_subdirectory(audaspace)
endif()
+if(WITH_MOD_REMESH)
+ add_subdirectory(dualcon)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
diff --git a/intern/SConscript b/intern/SConscript
index a6d50c80468..bb19426263a 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -9,7 +9,6 @@ SConscript(['audaspace/SConscript',
'container/SConscript',
'memutil/SConscript/',
'decimation/SConscript',
- 'dualcon/SConscript',
'iksolver/SConscript',
'itasc/SConscript',
'boolop/SConscript',
@@ -23,6 +22,9 @@ SConscript(['audaspace/SConscript',
# perhaps get rid of intern/csg?
NEW_CSG='false'
+if env ['WITH_BF_REMESH']:
+ SConscript(['dualcon/SConscript'])
+
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])