cmake: macos build

Author: igagis

build/cmake/CMakeLists.txt

@@ -14,6 +14,10 @@ myci_add_source_files(srcs
     RECURSIVE
 )
 
+enable_language(OBJCXX)
+
+list(APPEND srcs ../../src/${name}/glue/macos/glue.mm)
+
 myci_declare_library(${name}-opengl
     SOURCES
         ${srcs}
@@ -33,34 +37,44 @@ myci_declare_library(${name}-opengl
     NO_EXPORT
 )
 
-myci_declare_library(${name}-opengles
-    SOURCES
-        ${srcs}
-    PUBLIC_INCLUDE_DIRECTORIES
-        ../../src
-    # header files are installed by ${name}-opengl target
-    # INSTALL_INCLUDE_DIRECTORIES
-    #     ../../src/${name}
-    PREPROCESSOR_DEFINITIONS
-        "RUISAPP_RENDER_OPENGLES"
-    DEPENDENCIES
-        nitki
-        ruis
-        ruis-render-opengles
-    LINUX_ONLY_DEPENDENCIES
-        PkgConfig::gdk-3.0
-        PkgConfig::x11
-        PkgConfig::egl
-    WINDOWS_ONLY_DEPENDENCIES
-        unofficial-angle/unofficial::angle::libEGL
-    NO_EXPORT
-)
+# no opengles build on MACOS for now
+if(NOT APPLE)
+    myci_declare_library(${name}-opengles
+        SOURCES
+            ${srcs}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ../../src
+        # header files are installed by ${name}-opengl target
+        # INSTALL_INCLUDE_DIRECTORIES
+        #     ../../src/${name}
+        PREPROCESSOR_DEFINITIONS
+            "RUISAPP_RENDER_OPENGLES"
+        DEPENDENCIES
+            nitki
+            ruis
+            ruis-render-opengles
+        LINUX_ONLY_DEPENDENCIES
+            PkgConfig::gdk-3.0
+            PkgConfig::x11
+            PkgConfig::egl
+        WINDOWS_ONLY_DEPENDENCIES
+            unofficial-angle/unofficial::angle::libEGL
+        NO_EXPORT
+    )
+endif()
 
-myci_export(
-    TARGETS
-        ${name}-opengl
-        ${name}-opengles
-)
+if(APPLE)
+    myci_export(
+        TARGETS
+            ${name}-opengl
+    )
+else()
+    myci_export(
+        TARGETS
+            ${name}-opengl
+            ${name}-opengles
+    )
+endif()
 
 set(app_srcs)
 myci_add_source_files(app_srcs
@@ -79,12 +93,23 @@ myci_declare_application(${name}-opengl-test
         ruisapp::ruisapp-opengl
 )
 
-myci_declare_application(${name}-opengles-test
-    GUI
-    SOURCES
-        ${app_srcs}
-    RESOURCE_DIRECTORY
-        ../../tests/app/res
-    DEPENDENCIES
-        ruisapp::ruisapp-opengles
-)
+if(APPLE)
+    target_link_libraries(${name}-opengl-test
+        PRIVATE
+            # Link the Cocoa framework directly using the -framework flag string.
+            # The quotes are important so CMake passes it as a single linker argument.
+            "-framework Cocoa"
+        )
+endif()
+
+if(NOT APPLE)
+    myci_declare_application(${name}-opengles-test
+        GUI
+        SOURCES
+            ${app_srcs}
+        RESOURCE_DIRECTORY
+            ../../tests/app/res
+        DEPENDENCIES
+            ruisapp::ruisapp-opengles
+    )
+endif()

src/ruisapp/glue/macos/application.cxx

@@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "application.hxx"
 
+#include <ruis/render/opengl/context.hpp>
+
 namespace {
 ruis::real get_dots_per_inch()
 {

src/ruisapp/glue/macos/window.cxx

@@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "window.hxx"
 
+#include <GL/glew.h>
+
 #include "key_code.map.hxx"
 
 namespace {
@@ -577,6 +579,33 @@ void handle_character_input(
 
 @end
 
+native_window::native_window(
+	const utki::version_duplet& gl_version, //
+	const ruisapp::window_parameters& window_params,
+	native_window* shared_gl_context_native_window
+) :
+	cocoa_window(
+		window_params, //
+		shared_gl_context_native_window != nullptr
+	),
+	opengl_context(
+		window_params, //
+		shared_gl_context_native_window ? shared_gl_context_native_window->opengl_context.context
+										: nullptr // no shared context
+	),
+	cur_win_dims(window_params.dims.to<ruis::real>())
+{
+	[this->opengl_context.context setView:[this->cocoa_window.window contentView]];
+
+	// if there are no any GL contexts current, then set this one
+	if ([NSOpenGLContext currentContext] == nil) {
+		[this->opengl_context.context makeCurrentContext];
+	}
+	if (glewInit() != GLEW_OK) {
+		throw std::runtime_error("GLEW initialization failed");
+	}
+}
+
 void native_window::set_mouse_cursor_visible(bool visible)
 {
 	if (visible) {

src/ruisapp/glue/macos/window.hxx

@@ -212,31 +212,10 @@ class native_window : public ruis::render::native_window
 
 public:
 	native_window(
-		const utki::version_duplet& gl_version,
+		const utki::version_duplet& gl_version, //
 		const ruisapp::window_parameters& window_params,
 		native_window* shared_gl_context_native_window
-	) :
-		cocoa_window(
-			window_params, //
-			shared_gl_context_native_window != nullptr
-		),
-		opengl_context(
-			window_params, //
-			shared_gl_context_native_window ? shared_gl_context_native_window->opengl_context.context
-											: nullptr // no shared context
-		),
-		cur_win_dims(window_params.dims.to<ruis::real>())
-	{
-		[this->opengl_context.context setView:[this->cocoa_window.window contentView]];
-
-		// if there are no any GL contexts current, then set this one
-		if ([NSOpenGLContext currentContext] == nil) {
-			[this->opengl_context.context makeCurrentContext];
-		}
-		if (glewInit() != GLEW_OK) {
-			throw std::runtime_error("GLEW initialization failed");
-		}
-	}
+	);
 
 	void set_app_window(app_window* w)
 	{