mirror of
https://github.com/glfw/glfw.git
synced 2024-11-14 02:31:46 +00:00
Cleanup
This commit is contained in:
parent
a4fbc6fe91
commit
056c5d3f90
@ -30,13 +30,6 @@
|
|||||||
// Needed for _NSGetProgname
|
// Needed for _NSGetProgname
|
||||||
#include <crt_externs.h>
|
#include <crt_externs.h>
|
||||||
|
|
||||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
|
|
||||||
#define NSEventMaskKeyUp NSKeyUpMask
|
|
||||||
#define NSEventModifierFlagCommand NSCommandKeyMask
|
|
||||||
#define NSEventModifierFlagControl NSControlKeyMask
|
|
||||||
#define NSEventModifierFlagOption NSAlternateKeyMask
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Change to our application bundle's resources directory, if present
|
// Change to our application bundle's resources directory, if present
|
||||||
//
|
//
|
||||||
static void changeToResourcesDirectory(void)
|
static void changeToResourcesDirectory(void)
|
||||||
|
@ -41,6 +41,24 @@
|
|||||||
typedef void* id;
|
typedef void* id;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
|
||||||
|
#define NSBitmapFormatAlphaNonpremultiplied NSAlphaNonpremultipliedBitmapFormat
|
||||||
|
#define NSEventMaskAny NSAnyEventMask
|
||||||
|
#define NSEventMaskKeyUp NSKeyUpMask
|
||||||
|
#define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
|
||||||
|
#define NSEventModifierFlagCommand NSCommandKeyMask
|
||||||
|
#define NSEventModifierFlagControl NSControlKeyMask
|
||||||
|
#define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
|
||||||
|
#define NSEventModifierFlagOption NSAlternateKeyMask
|
||||||
|
#define NSEventModifierFlagShift NSShiftKeyMask
|
||||||
|
#define NSEventTypeApplicationDefined NSApplicationDefined
|
||||||
|
#define NSWindowStyleMaskBorderless NSBorderlessWindowMask
|
||||||
|
#define NSWindowStyleMaskClosable NSClosableWindowMask
|
||||||
|
#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask
|
||||||
|
#define NSWindowStyleMaskResizable NSResizableWindowMask
|
||||||
|
#define NSWindowStyleMaskTitled NSTitledWindowMask
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef VkFlags VkMacOSSurfaceCreateFlagsMVK;
|
typedef VkFlags VkMacOSSurfaceCreateFlagsMVK;
|
||||||
|
|
||||||
typedef struct VkMacOSSurfaceCreateInfoMVK
|
typedef struct VkMacOSSurfaceCreateInfoMVK
|
||||||
|
@ -29,23 +29,6 @@
|
|||||||
#include <float.h>
|
#include <float.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
|
|
||||||
#define NSWindowStyleMaskBorderless NSBorderlessWindowMask
|
|
||||||
#define NSWindowStyleMaskClosable NSClosableWindowMask
|
|
||||||
#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask
|
|
||||||
#define NSWindowStyleMaskResizable NSResizableWindowMask
|
|
||||||
#define NSWindowStyleMaskTitled NSTitledWindowMask
|
|
||||||
#define NSEventModifierFlagCommand NSCommandKeyMask
|
|
||||||
#define NSEventModifierFlagControl NSControlKeyMask
|
|
||||||
#define NSEventModifierFlagOption NSAlternateKeyMask
|
|
||||||
#define NSEventModifierFlagShift NSShiftKeyMask
|
|
||||||
#define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
|
|
||||||
#define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
|
|
||||||
#define NSEventMaskAny NSAnyEventMask
|
|
||||||
#define NSEventTypeApplicationDefined NSApplicationDefined
|
|
||||||
#define NSBitmapFormatAlphaNonpremultiplied NSAlphaNonpremultipliedBitmapFormat
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Returns the style mask corresponding to the window settings
|
// Returns the style mask corresponding to the window settings
|
||||||
//
|
//
|
||||||
static NSUInteger getStyleMask(_GLFWwindow* window)
|
static NSUInteger getStyleMask(_GLFWwindow* window)
|
||||||
|
@ -24,6 +24,11 @@
|
|||||||
//
|
//
|
||||||
//========================================================================
|
//========================================================================
|
||||||
|
|
||||||
|
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
|
||||||
|
#define NSOpenGLContextParameterSwapInterval NSOpenGLCPSwapInterval
|
||||||
|
#define NSOpenGLContextParameterSurfaceOpacity NSOpenGLCPSurfaceOpacity
|
||||||
|
#endif
|
||||||
|
|
||||||
#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL nsgl
|
#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL nsgl
|
||||||
#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryNSGL nsgl
|
#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryNSGL nsgl
|
||||||
|
|
||||||
|
@ -26,11 +26,6 @@
|
|||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
|
|
||||||
#define NSOpenGLContextParameterSwapInterval NSOpenGLCPSwapInterval
|
|
||||||
#define NSOpenGLContextParameterSurfaceOpacity NSOpenGLCPSurfaceOpacity
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink,
|
static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink,
|
||||||
const CVTimeStamp* now,
|
const CVTimeStamp* now,
|
||||||
const CVTimeStamp* outputTime,
|
const CVTimeStamp* outputTime,
|
||||||
|
Loading…
Reference in New Issue
Block a user