diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-18 00:51:39 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-18 00:51:39 +0400 |
| commit | 9def83f7e0795f11201af96cb64b4fb192e721d4 (patch) | |
| tree | ae559da826246c75c1ea2de5f89c1d541384423c /build_files | |
| parent | 5af9e8d5caef2b869308fbe7ba0f4869dde1ae95 (diff) | |
XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons
Disabled on FreeBSD platforms due to some linking errors.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/freebsd7-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/freebsd8-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/freebsd9-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 5 |
4 files changed, 10 insertions, 1 deletions
diff --git a/build_files/scons/config/freebsd7-config.py b/build_files/scons/config/freebsd7-config.py index 7826ca226f6..8d0d09907bd 100644 --- a/build_files/scons/config/freebsd7-config.py +++ b/build_files/scons/config/freebsd7-config.py @@ -164,6 +164,8 @@ BF_EXPAT = '/usr/local' BF_EXPAT_LIB = 'expat' BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib' +WITH_GHOST_XDND = False + WITH_BF_OPENMP = True #Ray trace optimization diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index f2d5cf2d0ed..6222d63c271 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -166,6 +166,8 @@ BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib' WITH_BF_OPENMP = True +WITH_GHOST_XDND = False + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index ea321b1a102..76539a330de 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -166,6 +166,8 @@ BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib' WITH_BF_OPENMP = True +WITH_GHOST_XDND = False + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index fe481d7ef34..f5f013c86fb 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -138,6 +138,7 @@ def validate_arguments(args, bc): 'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH', 'WITH_GHOST_COCOA', 'WITH_GHOST_SDL', + 'WITH_GHOST_XDND', 'BF_GHOST_DEBUG', 'USE_QTKIT', 'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE', @@ -567,7 +568,9 @@ def read_opts(env, cfg, args): ('BF_BOOST_INC', 'Boost include path', ''), ('BF_BOOST_LIB', 'Boost library', ''), ('BF_BOOST_LIBPATH', 'Boost library path', ''), - ('BF_BOOST_LIB_STATIC', 'Boost static library', '') + ('BF_BOOST_LIB_STATIC', 'Boost static library', ''), + + (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)) ) # end of opts.AddOptions() return localopts |