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

Merge pull request #16 from Th3T3chn0G1t/master

Browse Source 
Fixed macOS and Linux builds to work with Hazel patches - for Hazel-linux port
This commit is contained in:
Peter Nilsson 2023-03-31 11:08:02 +02:00 committed by GitHub
commit d385754e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
premake5.lua
View File

@ -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"

6
src/cocoa_init.m
View File

@ -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,

4
src/x11_init.c
View File

@ -1204,6 +1204,10 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
_glfwWaitEventsX11, _glfwWaitEventsX11,
_glfwWaitEventsTimeoutX11, _glfwWaitEventsTimeoutX11,
_glfwPostEmptyEventX11, _glfwPostEmptyEventX11,
// Hazel
_glfwSetWindowTitlebarNull,
_glfwGetEGLPlatformX11, _glfwGetEGLPlatformX11,
_glfwGetEGLNativeDisplayX11, _glfwGetEGLNativeDisplayX11,
_glfwGetEGLNativeWindowX11, _glfwGetEGLNativeWindowX11,