Cleanup previous PR

Revert the changes related to set_options debug_keyboard.
Remove the Carbon framework flag for glfw.
This commit is contained in:
pagedown 2022-01-10 10:24:10 +08:00
parent 24c44861ef
commit 4293325539
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
2 changed files with 2 additions and 2 deletions

View File

@ -111,7 +111,7 @@ def init_env(
elif module == 'cocoa':
ans.cppflags.append('-DGL_SILENCE_DEPRECATION')
for f_ in 'Cocoa Carbon IOKit CoreFoundation CoreVideo'.split():
for f_ in 'Cocoa IOKit CoreFoundation CoreVideo'.split():
ans.ldpaths.extend(('-framework', f_))
elif module == 'wayland':

View File

@ -685,7 +685,7 @@ PYWRAP0(get_options) {
PYWRAP1(set_options) {
PyObject *opts;
int is_wayland = 0, debug_rendering = 0, debug_font_fallback = 0;
PA("O|pppp", &opts, &is_wayland, &debug_rendering, &debug_font_fallback);
PA("O|ppp", &opts, &is_wayland, &debug_rendering, &debug_font_fallback);
if (opts == Py_None) {
Py_CLEAR(options_object);
Py_RETURN_NONE;