diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
| commit | e287e9d0c40d1cc9217f4ccfe4e26bbdc407c03e (patch) | |
| tree | ce4f9571c3fd1bbb2c2dc40b8ccd33e107dc36f2 /build_files | |
| parent | f0acdcf13526046236ce561736521100cba58ff1 (diff) | |
| parent | 6d5cf68aaf1347ff7456bb24a6b064c12aad0659 (diff) | |
Merged changes in the trunk up to revision 41387.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 8e5d914948b..f767376d122 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -434,7 +434,7 @@ macro(remove_strict_flags_file if(CMAKE_COMPILER_IS_GNUCC) set_source_files_properties(${_SOURCE} PROPERTIES - COMPILE_FLAGS "-Wno-deprecated-declarations" + COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}" ) endif() diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 49efa598ed8..a678bc68f54 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -150,7 +150,9 @@ def validate_arguments(args, bc): 'BF_GHOST_DEBUG', 'WITH_BF_RAYOPTIMIZATION', 'BF_RAYOPTIMIZATION_SSE_FLAGS', - 'BF_NO_ELBEEM', + 'WITH_BF_FLUID', + 'WITH_BF_DECIMATE', + 'WITH_BF_BOOLEAN', 'WITH_BF_CXX_GUARDEDALLOC', 'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC', 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC' @@ -250,7 +252,9 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)), ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''), - (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)), + (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)), + (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)), + (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)), ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''), (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)), ('BF_OPENAL', 'base path for OpenAL', ''), |