From 04dfd25c74c37f925caa79424f5c516dd6b0f8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Sat, 19 Mar 2022 23:29:19 +0100
Subject: [PATCH] CI: Try to build NazaraCore on macOS

---
 .github/workflows/macos-build.yml  | 19 +++++++++++++++++++
 include/Nazara/Core/DynLib.hpp     |  2 +-
 include/Nazara/Prerequisites.hpp   |  2 +-
 src/Nazara/Audio/OpenALLibrary.cpp |  2 +-
 src/Nazara/Core/Stream.cpp         |  2 +-
 src/Nazara/Core/Uuid.cpp           |  4 ++--
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index 6b9dee7f5..30524121e 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -58,3 +58,22 @@ jobs:
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
       run: xmake config --shadernodes=y --tests=y --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
+
+    # Build the engine
+    - name: Build Nazara
+      run: xmake build NazaraCore
+
+    # Run unit tests
+    #- name: Run unit tests
+    #  if: matrix.mode != 'releasedbg'
+    #  run: xmake run NazaraUnitTests
+
+    # Install the result files
+    - name: Install Nazara
+      run: xmake install -vo package
+
+    # Upload artifacts
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}
+        path: package
diff --git a/include/Nazara/Core/DynLib.hpp b/include/Nazara/Core/DynLib.hpp
index 5ec42c2a9..8e6f6d1d0 100644
--- a/include/Nazara/Core/DynLib.hpp
+++ b/include/Nazara/Core/DynLib.hpp
@@ -15,7 +15,7 @@
 	#define NAZARA_DYNLIB_EXTENSION ".dll"
 #elif defined(NAZARA_PLATFORM_LINUX)
 	#define NAZARA_DYNLIB_EXTENSION ".so"
-#elif defined(NAZARA_PLATFORM_MACOSX)
+#elif defined(NAZARA_PLATFORM_MACOS)
 	#define NAZARA_DYNLIB_EXTENSION ".dynlib"
 #else
 	#error OS not handled
diff --git a/include/Nazara/Prerequisites.hpp b/include/Nazara/Prerequisites.hpp
index 42204284b..3b371c863 100644
--- a/include/Nazara/Prerequisites.hpp
+++ b/include/Nazara/Prerequisites.hpp
@@ -132,7 +132,7 @@
 	#define NAZARA_IMPORT __attribute__((visibility ("default")))
 #elif defined(__APPLE__) && defined(__MACH__)
 	#define NAZARA_PLATFORM_DESKTOP
-	#define NAZARA_PLATFORM_MACOSX
+	#define NAZARA_PLATFORM_MACOS
 	#define NAZARA_PLATFORM_POSIX
 	
 	#define NAZARA_EXPORT __attribute__((visibility ("default")))
diff --git a/src/Nazara/Audio/OpenALLibrary.cpp b/src/Nazara/Audio/OpenALLibrary.cpp
index a84d1741c..b7703411d 100644
--- a/src/Nazara/Audio/OpenALLibrary.cpp
+++ b/src/Nazara/Audio/OpenALLibrary.cpp
@@ -35,7 +35,7 @@ namespace Nz
 			"libopenal.so.0",
 			"libopenal.so"
 		};
-#elif defined(NAZARA_PLATFORM_MACOSX)
+#elif defined(NAZARA_PLATFORM_MACOS)
 		std::array libs {
 			"libopenal.dylib",
 			"libopenal.1.dylib",
diff --git a/src/Nazara/Core/Stream.cpp b/src/Nazara/Core/Stream.cpp
index 52d20ff65..2761b8d3b 100644
--- a/src/Nazara/Core/Stream.cpp
+++ b/src/Nazara/Core/Stream.cpp
@@ -157,7 +157,7 @@ namespace Nz
 #elif defined(NAZARA_PLATFORM_LINUX)
 			std::string_view temp(string);
 			// Nothing to do
-#elif defined(NAZARA_PLATFORM_MACOSX)
+#elif defined(NAZARA_PLATFORM_MACOS)
 			std::string temp(string);
 			ReplaceStr(temp, "\n", "\r");
 #endif
diff --git a/src/Nazara/Core/Uuid.cpp b/src/Nazara/Core/Uuid.cpp
index a7d77f83f..287d64df2 100644
--- a/src/Nazara/Core/Uuid.cpp
+++ b/src/Nazara/Core/Uuid.cpp
@@ -7,7 +7,7 @@
 
 #ifdef NAZARA_PLATFORM_WINDOWS
 #include <objbase.h>
-#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOSX)
+#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOS)
 #include <uuid/uuid.h>
 #endif
 
@@ -94,7 +94,7 @@ namespace Nz
 
 		for (unsigned int i = 0; i < 8; ++i)
 			uuid[8 + i] = static_cast<UInt8>(id.Data4[i]);
-#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOSX)
+#elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_MACOS)
 		uuid_t id;
 		uuid_generate(id);