KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'joystick-platform' of https://github.com/jamessan/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2019-09-04 08:43:16 +05:30
commit 336ee53fea
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glfw/glfw.py
View File

@ -8,10 +8,7 @@ import re
import sys import sys
_plat = sys.platform.lower() _plat = sys.platform.lower()
is_freebsd = 'freebsd' in _plat is_linux = 'linux' in _plat
is_netbsd = 'netbsd' in _plat
is_dragonflybsd = 'dragonfly' in _plat
is_bsd = is_freebsd or is_netbsd or is_dragonflybsd
base = os.path.dirname(os.path.abspath(__file__)) base = os.path.dirname(os.path.abspath(__file__))
@ -30,7 +27,7 @@ def init_env(env, pkg_config, at_least_version, test_compile, module='x11'):
sinfo = json.load(f) sinfo = json.load(f)
module_sources = list(sinfo[module]['sources']) module_sources = list(sinfo[module]['sources'])
if module in ('x11', 'wayland'): if module in ('x11', 'wayland'):
remove = 'linux_joystick.c' if is_bsd else 'null_joystick.c' remove = 'null_joystick.c' if is_linux else 'linux_joystick.c'
module_sources.remove(remove) module_sources.remove(remove)
ans.sources = sinfo['common']['sources'] + module_sources ans.sources = sinfo['common']['sources'] + module_sources