diff options
| -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/config/linux-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 4 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 7 |
5 files changed, 13 insertions, 4 deletions
diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index 3318e21bf1d..e94f61f7819 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -139,7 +139,7 @@ BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr/local' BF_OPENGL_INC = '${BF_OPENGL}/include' -BF_OPENGL_LIB = 'GL GLU X11 Xi' +BF_OPENGL_LIB = 'GL GLU X11 Xi Xxf86vm' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index b6c5c0d45eb..8535ececb24 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -139,7 +139,7 @@ BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr/local' BF_OPENGL_INC = '${BF_OPENGL}/include' -BF_OPENGL_LIB = 'GL GLU X11 Xi' +BF_OPENGL_LIB = 'GL GLU X11 Xi Xxf86vm' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 6106142f8a9..93fa6137bb0 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -152,7 +152,7 @@ BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr' BF_OPENGL_INC = '${BF_OPENGL}/include' -BF_OPENGL_LIB = 'GL GLU X11 Xi' +BF_OPENGL_LIB = 'GL GLU X11 Xi Xxf86vm' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 53dd99a7971..454e72a1a72 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -141,6 +141,8 @@ def validate_arguments(args, bc): 'WITH_GHOST_COCOA', 'WITH_GHOST_SDL', 'WITH_GHOST_XDND', + 'WITH_X11_XINPUT', + 'WITH_X11_XF86VMODE', 'BF_GHOST_DEBUG', 'USE_QTKIT', 'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE', @@ -424,6 +426,8 @@ def read_opts(env, cfg, args): ('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''), (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)), (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)), + (BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)), + (BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)), (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)), ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''), diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index e48e4ee6b96..d1ecc5e8c13 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -75,7 +75,12 @@ elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'f ## So until this is supported properly as with CMake, ## just dont use the PREFIX. # defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option - defs += ['WITH_X11_XINPUT'] # XXX, make an option + if env['WITH_X11_XINPUT']: + defs += ['WITH_X11_XINPUT'] + + if env['WITH_X11_XF86VMODE']: + #incs += env['X11_xf86vmode_INCLUDE_PATH'] + defs += ['WITH_X11_XF86VMODE'] # freebsd doesn't seem to support XDND protocol if env['WITH_GHOST_XDND'] and window_system not in ('freebsd7', 'freebsd8', 'freebsd9'): |