mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-29 15:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at fixing compilation errors for MacOS

Browse Source
This commit is contained in:
ws909 2023-01-26 08:31:31 +01:00
parent fe1eddc2ad
commit bbd5bcb7fd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_init.m
View File

@ -36,11 +36,11 @@
#include <crt_externs.h> #include <crt_externs.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101000
NSAppearanceName const NSAppearanceNameVibrantLight = @"NSAppearanceNameVibrantLight"; NSAppearanceName const NSAppearanceNameVibrantLight = @"NSAppearanceNameVibrantLight";
NSAppearanceName const NSAppearanceNameVibrantDark = @"NSAppearanceNameVibrantDark"; NSAppearanceName const NSAppearanceNameVibrantDark = @"NSAppearanceNameVibrantDark";
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
NSAppearanceName const NSAppearanceNameDarkAqua = @"NSAppearanceNameDarkAqua"; NSAppearanceName const NSAppearanceNameDarkAqua = @"NSAppearanceNameDarkAqua";
NSAppearanceName const NSAppearanceNameAccessibilityHighContrastAqua = @"NSAppearanceNameAccessibilityAqua"; NSAppearanceName const NSAppearanceNameAccessibilityHighContrastAqua = @"NSAppearanceNameAccessibilityAqua";
NSAppearanceName const NSAppearanceNameAccessibilityHighContrastDarkAqua = @"NSAppearanceNameAccessibilityDarkAqua"; NSAppearanceName const NSAppearanceNameAccessibilityHighContrastDarkAqua = @"NSAppearanceNameAccessibilityDarkAqua";

1
src/cocoa_platform.h
View File

@ -40,6 +40,7 @@
#else #else
typedef void* id; typedef void* id;
typedef void NSAppearance; typedef void NSAppearance;
typedef id NSString;
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED < 101300 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101300

2
src/cocoa_window.m
View File

@ -1935,7 +1935,7 @@ GLFWtheme* _glfwGetThemeCocoa(_GLFWwindow* window)
if (@available(macOS 10.09, *)) if (@available(macOS 10.09, *))
{ {
nsAppearanceToGLFWTheme([window->ns.object appearance], theme); nsAppearanceToGLFWTheme([(NSWindow*)window->ns.object appearance], theme);
} }
if (@available(macOS 10.14, *)) { if (@available(macOS 10.14, *)) {