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

Simplify GLFW compilation code

Browse Source 
This commit removes the need for `is_macos` in `glfw/glfw.py` by moving a few lines of code. Instead of relying on the information that the compilation is or isn't happening on macOS, the code now does the right thing based on which `module` is being built.
This changes the order of the compilation flags slightly.
This commit is contained in:
Luflosi 2019-08-11 02:33:21 +02:00
parent d84e22fbf1
commit 902fc22670
No known key found for this signature in database
GPG Key ID: 14140F703B7D8362
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glfw/glfw.py
View File

@ -8,7 +8,6 @@ import re
import sys import sys
_plat = sys.platform.lower() _plat = sys.platform.lower()
is_macos = 'darwin' in _plat
is_freebsd = 'freebsd' in _plat is_freebsd = 'freebsd' in _plat
is_netbsd = 'netbsd' in _plat is_netbsd = 'netbsd' in _plat
is_dragonflybsd = 'dragonfly' in _plat is_dragonflybsd = 'dragonfly' in _plat
@ -23,17 +22,10 @@ def wayland_protocol_file_name(base, ext='c'):
def init_env(env, pkg_config, at_least_version, test_compile, module='x11'): def init_env(env, pkg_config, at_least_version, test_compile, module='x11'):
ans = env.copy() ans = env.copy()
if not is_macos:
ans.cflags.append('-pthread')
ans.ldpaths.append('-pthread')
ans.cflags.append('-fpic') ans.cflags.append('-fpic')
ans.cppflags.append('-D_GLFW_' + module.upper()) ans.cppflags.append('-D_GLFW_' + module.upper())
ans.cppflags.append('-D_GLFW_BUILD_DLL') ans.cppflags.append('-D_GLFW_BUILD_DLL')
if is_macos:
ans.cppflags.append('-DGL_SILENCE_DEPRECATION')
else:
ans.ldpaths.extend('-lrt -lm -ldl'.split())
with open(os.path.join(base, 'source-info.json')) as f: with open(os.path.join(base, 'source-info.json')) as f:
sinfo = json.load(f) sinfo = json.load(f)
module_sources = list(sinfo[module]['sources']) module_sources = list(sinfo[module]['sources'])
@ -45,6 +37,9 @@ def init_env(env, pkg_config, at_least_version, test_compile, module='x11'):
ans.all_headers = [x for x in os.listdir(base) if x.endswith('.h')] ans.all_headers = [x for x in os.listdir(base) if x.endswith('.h')]
if module in ('x11', 'wayland'): if module in ('x11', 'wayland'):
ans.cflags.append('-pthread')
ans.ldpaths.append('-pthread')
ans.ldpaths.extend('-lrt -lm -ldl'.split())
at_least_version('xkbcommon', 0, 5) at_least_version('xkbcommon', 0, 5)
if module == 'x11': if module == 'x11':
@ -53,6 +48,7 @@ def init_env(env, pkg_config, at_least_version, test_compile, module='x11'):
ans.ldpaths.extend(pkg_config(dep, '--libs')) ans.ldpaths.extend(pkg_config(dep, '--libs'))
elif module == 'cocoa': elif module == 'cocoa':
ans.cppflags.append('-DGL_SILENCE_DEPRECATION')
for f in 'Cocoa IOKit CoreFoundation CoreVideo'.split(): for f in 'Cocoa IOKit CoreFoundation CoreVideo'.split():
ans.ldpaths.extend(('-framework', f)) ans.ldpaths.extend(('-framework', f))