Merge pull request #16 from Th3T3chn0G1t/master

Fixed macOS and Linux builds to work with Hazel patches - for Hazel-linux port
TheCherno · Mar 31, 2023 · d385754 · d385754
2 parents d516e66 + a9d7848
commit d385754
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/premake5.lua b/premake5.lua
@@ -39,6 +39,7 @@ project "GLFW"
 			"src/xkb_unicode.c",
 			"src/posix_time.c",
 			"src/posix_thread.c",
+			"src/posix_module.c",
 			"src/glx_context.c",
 			"src/egl_context.c",
 			"src/osmesa_context.c",
@@ -50,6 +51,28 @@ project "GLFW"
 			"_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"
 		systemversion "latest"
 

diff --git a/src/cocoa_init.m b/src/cocoa_init.m
@@ -543,13 +543,17 @@ GLFWbool _glfwConnectCocoa(int platformID, _GLFWplatform* platform)
         _glfwGetWindowOpacityCocoa,
         _glfwSetWindowResizableCocoa,
         _glfwSetWindowDecoratedCocoa,
-        _glfwSetWindowFloatingCocoa,
+        _glfwSetWindowFloatingNull,
         _glfwSetWindowOpacityCocoa,
         _glfwSetWindowMousePassthroughCocoa,
         _glfwPollEventsCocoa,
         _glfwWaitEventsCocoa,
         _glfwWaitEventsTimeoutCocoa,
         _glfwPostEmptyEventCocoa,
+
+        // Hazel
+        _glfwSetWindowTitlebarNull,
+
         _glfwGetEGLPlatformCocoa,
         _glfwGetEGLNativeDisplayCocoa,
         _glfwGetEGLNativeWindowCocoa,

diff --git a/src/x11_init.c b/src/x11_init.c
@@ -1204,6 +1204,10 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform)
         _glfwWaitEventsX11,
         _glfwWaitEventsTimeoutX11,
         _glfwPostEmptyEventX11,
+
+        // Hazel
+        _glfwSetWindowTitlebarNull,
+
         _glfwGetEGLPlatformX11,
         _glfwGetEGLNativeDisplayX11,
         _glfwGetEGLNativeWindowX11,