Starting to support OSX

.gitignore

@@ -83,4 +83,6 @@ assets/borrowed
 .VSCode*
 
 /vita
-/tools
+/tools
+
+._*

cmake/hosts/CMakeLists.txt

@@ -8,6 +8,8 @@ if(WIN32)
   set(DAWN_BUILD_HOST "build-host-win32")
 elseif(UNIX AND NOT APPLE)
   set(DAWN_BUILD_HOST "build-host-linux64")
+elseif(UNIX AND APPLE)
+  set(DAWN_BUILD_HOST "build-host-osx")
 endif()
 
 add_subdirectory(${DAWN_BUILD_HOST})

cmake/hosts/build-host-osx/CMakeLists.txt

@@ -0,0 +1,6 @@
+# Copyright (c) 2022 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+set(DAWN_BUILD_HOST_LIBS "" CACHE INTERNAL ${DAWN_CACHE_TARGET})

cmake/targets/target-liminal-osx-glfw/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+set(DAWN_BUILDING dawnliminal CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_OSX true CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_GLFW true CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_TARGET_NAME "Liminal" CACHE INTERNAL ${DAWN_CACHE_TARGET})
+set(DAWN_VISUAL_NOVEL true CACHE INTERNAL ${DAWN_CACHE_TARGET})

src/CMakeLists.txt

@@ -30,6 +30,8 @@ if(DEFINED DAWN_TARGET_NAME)
     add_subdirectory(dawnwin32)
   elseif(DAWN_TARGET_LINUX64)
     add_subdirectory(dawnlinux64)
+  elseif(DAWN_TARGET_OSX)
+    add_subdirectory(dawnosx)
   elseif(DAWN_TARGET_VITA)
     add_subdirectory(dawnvita)
   else()

src/dawnglfw/host/DawnGLFWHost.cpp

@@ -34,6 +34,10 @@ int32_t DawnHost::init(DawnGame *game) {
   
   // Setup window hints 
   glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, false);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+  glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+  glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
   
   // Create Window
   this->data->window = glfwCreateWindow(

src/dawnliminal/game/LiminalGame.cpp

@@ -5,9 +5,11 @@
 
 #include "game/DawnGame.hpp"
 #include "vnscenes/SceneInitial.hpp"
+#include "scenes/HelloWorldScene.hpp"
 
 using namespace Dawn;
 
 Scene * Dawn::dawnGameGetInitialScene(DawnGame *game) {
-  return new SceneInitial(game);
+  // return new SceneInitial(game);
+  return new HelloWorldScene(game);
 }

src/dawnopengl/display/shader/shaders/SimpleTexturedShader.cpp

@@ -44,6 +44,7 @@ void SimpleTexturedShader::compile() {
         "} else {\n"
           "o_Color = u_Color;"
         "}\n"
+        "o_Color = vec4(1, 0, 0, 1);\n"
       "}\n"
     );
   #elif DAWN_OPENGL_HLSL

src/dawnosx/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Copyright (c) 2022 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Libraries
+# target_link_libraries(${DAWN_TARGET_NAME}
+#   PUBLIC
+#     m
+# )
+
+# Includes
+target_include_directories(${DAWN_TARGET_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+# Platform variables
+target_compile_definitions(${DAWN_TARGET_NAME}
+  PUBLIC
+    DAWN_ASSET_BUILD_PREFIX="../../assets/"
+)
+
+# Subdirs
+add_subdirectory(host)

src/dawnosx/host/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (c) 2022 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    DawnHostOSX.cpp
+)

src/dawnosx/host/DawnHostOSX.cpp

@@ -0,0 +1,57 @@
+// Copyright (c) 2022 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "DawnHostOSX.hpp"
+
+#if DAWN_DEBUG_BUILD
+  uint64_t dawnAllocatedItemCount;
+#endif
+
+using namespace Dawn;
+
+int32_t main(int32_t argc, char **args) {
+  int32_t result;
+
+  #if DAWN_DEBUG_BUILD
+    dawnAllocatedItemCount = 0;
+  #endif
+
+  // Create the host
+  auto host = new DawnHost();
+  auto game = new DawnGame(host);
+
+  // Initialize the host and error check
+  result = host->init(game);
+  switch(result) {
+    case DAWN_HOST_INIT_RESULT_SUCCESS:
+      break;
+    default:
+      return result;
+  }
+
+  // Request the main loop to start running.
+  result = host->start(game);
+  switch(result) {
+    case DAWN_HOST_START_RESULT_SUCCESS:
+      break;
+    case DAWN_HOST_START_RESULT_EXIT_SUCCESS:
+      break;
+    default:
+      return result;
+  }
+
+  // Main loop finished without errors, cleanup
+  host->unload(game);
+
+  delete game;
+  delete host;
+
+  #if DAWN_DEBUG_BUILD
+    assertTrue(dawnAllocatedItemCount == 0);
+  #endif
+
+  // Success
+  return 0;
+}

src/dawnosx/host/DawnHostOSX.hpp

@@ -0,0 +1,18 @@
+// Copyright (c) 2022 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "dawnlibs.hpp"
+#include "host/DawnHost.hpp"
+#include "game/DawnGame.hpp"
+
+/**
+ * Main entry function received by parent Win32 Operating System.
+ * 
+ * @param argc Count of arguments passed to the program.
+ * @param args Array of strings provided to the program.
+ * @return 0 for success, else for any issue/error.
+ */
+int32_t main(int32_t argc, char **args);

src/dawnshared/dawnsharedlibs.hpp

@@ -11,7 +11,6 @@ extern "C" {
   #include <stdio.h>
   #include <stdint.h>
   #include <stdbool.h>
-  #include <malloc.h>
   #include <string.h>
   #include <math.h>
   #include <stdlib.h>