← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to build_files/scons/tools/btools.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build_files/scons/tools/btools.py
141
141
            'WITH_GHOST_COCOA',
142
142
            'WITH_GHOST_SDL',
143
143
            'WITH_GHOST_XDND',
 
144
            'WITH_X11_XINPUT',
 
145
            'WITH_X11_XF86VMODE',
144
146
            'BF_GHOST_DEBUG',
145
147
            'USE_QTKIT',
146
148
            'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
424
426
        ('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''),
425
427
        (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)),
426
428
        (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)),
 
429
        (BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)),
 
430
        (BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)),
427
431
        (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
428
432
        ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''),
429
433