mirror of
https://github.com/glfw/glfw.git
synced 2024-11-15 02:34:36 +00:00
Fixed macOS and Linux builds to work with Hazel patches
This commit is contained in:
parent
d516e66801
commit
a9d7848172
23
premake5.lua
23
premake5.lua
@ -39,6 +39,7 @@ project "GLFW"
|
|||||||
"src/xkb_unicode.c",
|
"src/xkb_unicode.c",
|
||||||
"src/posix_time.c",
|
"src/posix_time.c",
|
||||||
"src/posix_thread.c",
|
"src/posix_thread.c",
|
||||||
|
"src/posix_module.c",
|
||||||
"src/glx_context.c",
|
"src/glx_context.c",
|
||||||
"src/egl_context.c",
|
"src/egl_context.c",
|
||||||
"src/osmesa_context.c",
|
"src/osmesa_context.c",
|
||||||
@ -50,6 +51,28 @@ project "GLFW"
|
|||||||
"_GLFW_X11"
|
"_GLFW_X11"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filter "system:macosx"
|
||||||
|
pic "On"
|
||||||
|
|
||||||
|
files
|
||||||
|
{
|
||||||
|
"src/cocoa_init.m",
|
||||||
|
"src/cocoa_monitor.m",
|
||||||
|
"src/cocoa_window.m",
|
||||||
|
"src/cocoa_joystick.m",
|
||||||
|
"src/cocoa_time.c",
|
||||||
|
"src/nsgl_context.m",
|
||||||
|
"src/posix_thread.c",
|
||||||
|
"src/posix_module.c",
|
||||||
|
"src/osmesa_context.c",
|
||||||
|
"src/egl_context.c"
|
||||||
|
}
|
||||||
|
|
||||||
|
defines
|
||||||
|
{
|
||||||
|
"_GLFW_COCOA"
|
||||||
|
}
|
||||||
|
|
||||||
filter "system:windows"
|
filter "system:windows"
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
|
|
||||||
|
@ -543,13 +543,17 @@ GLFWbool _glfwConnectCocoa(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwGetWindowOpacityCocoa,
|
_glfwGetWindowOpacityCocoa,
|
||||||
_glfwSetWindowResizableCocoa,
|
_glfwSetWindowResizableCocoa,
|
||||||
_glfwSetWindowDecoratedCocoa,
|
_glfwSetWindowDecoratedCocoa,
|
||||||
_glfwSetWindowFloatingCocoa,
|
_glfwSetWindowFloatingNull,
|
||||||
_glfwSetWindowOpacityCocoa,
|
_glfwSetWindowOpacityCocoa,
|
||||||
_glfwSetWindowMousePassthroughCocoa,
|
_glfwSetWindowMousePassthroughCocoa,
|
||||||
_glfwPollEventsCocoa,
|
_glfwPollEventsCocoa,
|
||||||
_glfwWaitEventsCocoa,
|
_glfwWaitEventsCocoa,
|
||||||
_glfwWaitEventsTimeoutCocoa,
|
_glfwWaitEventsTimeoutCocoa,
|
||||||
_glfwPostEmptyEventCocoa,
|
_glfwPostEmptyEventCocoa,
|
||||||
|
|
||||||
|
// Hazel
|
||||||
|
_glfwSetWindowTitlebarNull,
|
||||||
|
|
||||||
_glfwGetEGLPlatformCocoa,
|
_glfwGetEGLPlatformCocoa,
|
||||||
_glfwGetEGLNativeDisplayCocoa,
|
_glfwGetEGLNativeDisplayCocoa,
|
||||||
_glfwGetEGLNativeWindowCocoa,
|
_glfwGetEGLNativeWindowCocoa,
|
||||||
|
@ -1204,6 +1204,10 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwWaitEventsX11,
|
_glfwWaitEventsX11,
|
||||||
_glfwWaitEventsTimeoutX11,
|
_glfwWaitEventsTimeoutX11,
|
||||||
_glfwPostEmptyEventX11,
|
_glfwPostEmptyEventX11,
|
||||||
|
|
||||||
|
// Hazel
|
||||||
|
_glfwSetWindowTitlebarNull,
|
||||||
|
|
||||||
_glfwGetEGLPlatformX11,
|
_glfwGetEGLPlatformX11,
|
||||||
_glfwGetEGLNativeDisplayX11,
|
_glfwGetEGLNativeDisplayX11,
|
||||||
_glfwGetEGLNativeWindowX11,
|
_glfwGetEGLNativeWindowX11,
|
||||||
|
Loading…
Reference in New Issue
Block a user