diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-12-06 20:06:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 20:06:59 -0300 |
| commit | a7440cd81ae391993fbee85a6a260ca6dd41f09b (patch) | |
| tree | 148ba929fea2eabdf50adb7eaa3e02484da6a1e0 /platform/x11/detect.py | |
| parent | e6f3253f7d638cbae13a75778a57b46b04ba868c (diff) | |
| parent | 6f3343f1ce2612cea233975c635a2f37b79fce2f (diff) | |
| download | redot-engine-a7440cd81ae391993fbee85a6a260ca6dd41f09b.tar.gz | |
Merge pull request #14347 from RandomShaper/adpod-mt
Implement multitouch on X11 and improve it on Windows
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 3d07851c4f..d7dbe71da4 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -55,6 +55,7 @@ def get_opts(): BoolVariable('pulseaudio', 'Detect & use pulseaudio', True), BoolVariable('udev', 'Use udev for gamepad connection callbacks', False), EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')), + BoolVariable('touch', 'Enable touch events', True), ] @@ -141,6 +142,14 @@ def configure(env): env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + if (env['touch']): + x11_error = os.system("pkg-config xi --modversion > /dev/null ") + if (x11_error): + print("xi not found.. cannot build with touch. Aborting.") + sys.exit(255) + env.ParseConfig('pkg-config xi --cflags --libs') + env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + # FIXME: Check for existence of the libs before parsing their flags with pkg-config if not env['builtin_openssl']: |