Add macOS support

.github/workflows/build-cmake.yml

@@ -19,14 +19,16 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-with-cmake:
+  ubuntu:
+    name: "Ubuntu (${{ matrix.compiler.cc }})"
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         compiler:
-          - [cc: gcc, cxx: g++]
-          - [cc: clang, cxx: clang++]
+          - {cc: gcc, cxx: g++}
+          - {cc: clang, cxx: clang++}
 
     steps:
       - uses: actions/checkout@v2
@@ -37,7 +39,11 @@ jobs:
         run: sudo apt update
 
       - name: Install dependencies
-        run: sudo apt install --yes clang cmake libglew-dev libglfw3-dev libglm-dev libopenal-dev xorg-dev
+        run: sudo apt install --yes cmake libglew-dev libglfw3-dev libglm-dev libopenal-dev xorg-dev
+
+      - name: Install clang
+        run: sudo apt install --yes clang
+        if: ${{ matrix.compiler.cc == 'clang' }}
 
       - name: cmake
         uses: ashutoshvarma/action-cmake-build@master
@@ -48,3 +54,36 @@ jobs:
           build-type: Release
           configure-options: -DWITH_BOX2D=Yes
           parallel: 2
+
+  macos:
+    name: "macOS (${{ matrix.compiler.cc }}, box2d: ${{ matrix.with_box2d }})"
+    runs-on: macos-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        with_box2d: [yes, no]
+        compiler:
+          - {cc: clang, cxx: clang++}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Install dependencies
+        run: brew install glew glfw3 glm
+
+      - name: Install Box2D
+        run: brew install box2d
+        if: ${{ matrix.with_box2d == 'no' }}
+
+      - name: cmake
+        uses: ashutoshvarma/action-cmake-build@master
+        with:
+          build-dir: ${{ github.workspace }}/build
+          cc: ${{ matrix.compiler.cc }}
+          cxx: ${{ matrix.compiler.cxx }}
+          build-type: Release
+          configure-options: -DWITH_BOX2D=${{ matrix.with_box2d }}
+          parallel: 2

cmake/Carnage3D.cmake

@@ -30,6 +30,7 @@ endif()
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(glfw3 REQUIRED)
+find_package(glm REQUIRED)
 
 if(NOT(APPLE))
     target_link_libraries(carnage3d stdc++fs)

src/FileSystem.cpp

@@ -15,31 +15,31 @@ CvarString gCvarGtaDataPath("g_gtadata", "", "GTA data location", CvarFlags_Arch
 
 FileSystem gFiles;
 
-bool FileSystem::Initialize()
-{
-    mExecutablePath = cxx::get_executable_path();
-    mExecutableDirectory = cxx::get_parent_directory(mExecutablePath);
-    mWorkingDirectoryPath = mExecutableDirectory;
-    mWorkingDirectoryPath = cxx::get_parent_directory(mWorkingDirectoryPath); // root
-    if (!mWorkingDirectoryPath.empty())
-    {
-        mWorkingDirectoryPath.append("/");
-    }
-    mWorkingDirectoryPath.append("gamedata");
-    AddSearchPlace(mWorkingDirectoryPath);
-
-    gConsole.LogMessage(eLogMessage_Info, "Working directory: '%s'", mWorkingDirectoryPath.c_str());
-    return true;
-}
-
-void FileSystem::Deinit()
-{
-    mExecutablePath.clear();
-    mExecutableDirectory.clear();
-    mWorkingDirectoryPath.clear();
-    mGameMapsList.clear();
-}
-
+bool FileSystem::Initialize()
+{
+    mExecutablePath = cxx::get_executable_path();
+    mExecutableDirectory = cxx::get_parent_directory(mExecutablePath);
+    mWorkingDirectoryPath = mExecutableDirectory;
+    mWorkingDirectoryPath = cxx::get_parent_directory(mWorkingDirectoryPath); // root
+    if (!mWorkingDirectoryPath.empty())
+    {
+        mWorkingDirectoryPath.append("/");
+    }
+    mWorkingDirectoryPath.append("gamedata");
+    AddSearchPlace(mWorkingDirectoryPath);
+
+    gConsole.LogMessage(eLogMessage_Info, "Working directory: '%s'", mWorkingDirectoryPath.c_str());
+    return true;
+}
+
+void FileSystem::Deinit()
+{
+    mExecutablePath.clear();
+    mExecutableDirectory.clear();
+    mWorkingDirectoryPath.clear();
+    mGameMapsList.clear();
+}
+
 bool FileSystem::OpenBinaryFile(const std::string& objectName, std::ifstream& instream)
 {
     instream.close();
@@ -160,11 +160,11 @@ bool FileSystem::ReadTextFile(const std::string& objectName, std::string& output
     if (!OpenTextFile(objectName, fileStream))
         return false;
 
-    std::string stringLine {};
-    while (std::getline(fileStream, stringLine, '\n'))
-    {
-        output.append(stringLine);
-        output.append("\n");
+    std::string stringLine {};
+    while (std::getline(fileStream, stringLine, '\n'))
+    {
+        output.append(stringLine);
+        output.append("\n");
     }
     return true;
 }
@@ -294,7 +294,7 @@ bool FileSystem::ScanGtaMaps()
         {
             if (cxx::get_file_extension(curr) == GTA1MapFileExtension)
             {
-                mGameMapsList.push_back(curr);  
+                mGameMapsList.push_back(curr);
             }
         });
     }
@@ -333,4 +333,4 @@ bool FileSystem::SaveConfig(const std::string& filePath, const cxx::json_documen
 
     outputFile << documentContent;
     return true;
-}
+}

src/OpenALDefs.h

@@ -1,8 +1,13 @@
-#pragma once
-
-#include <AL/al.h>
-#include "AL/alc.h"
-
+#pragma once
+
+#if OS_NAME == OS_MACOS
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
+
 // checks current openal error code
 #ifdef _DEBUG
     #define alCheckError()\
@@ -22,7 +27,7 @@
 // resets current openal error code
 inline void alClearError()
 {
-    for (ALenum alErrorCode = ::alGetError(); alErrorCode != AL_NO_ERROR; alErrorCode = ::alGetError()) 
+    for (ALenum alErrorCode = ::alGetError(); alErrorCode != AL_NO_ERROR; alErrorCode = ::alGetError())
     {
     }
 }
@@ -34,6 +39,6 @@ struct AudioDeviceCaps
     AudioDeviceCaps() = default;
 
 public:
-    int mMaxSourcesMono = 0;
+    int mMaxSourcesMono = 0;
     int mMaxSourcesStereo = 0;
-};
+};

src/macro.h

@@ -1,12 +1,15 @@
 #pragma once
 
-#define OS_WINDOWS  1
-#define OS_LINUX    2
-#define OS_UNIX     3
-#define OS_UNKNOWN  0    
+#define OS_WINDOWS 1
+#define OS_LINUX   2
+#define OS_UNIX    3
+#define OS_MACOS   4
+#define OS_UNKNOWN 0
 
 #if defined(_WIN32)
     #define OS_NAME OS_WINDOWS
+#elif defined(__APPLE__)
+    #define OS_NAME OS_MACOS
 #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__)
     #define OS_NAME OS_LINUX
 #else
@@ -17,28 +20,30 @@
     #define _CRT_SECURE_NO_WARNINGS
     #define _SCL_SECURE_NO_WARNINGS
 
-#ifdef _DEBUG
-    #define _CRTDBG_MAP_ALLOC
-    #include <crtdbg.h>
+#ifdef _DEBUG
+    #define _CRTDBG_MAP_ALLOC
+    #include <crtdbg.h>
 #endif
 
 #elif OS_NAME == OS_LINUX
     #include <assert.h>
+#elif OS_NAME == OS_MACOS
+    #include <mach-o/dyld.h>
+#endif
+
+#ifdef _DEBUG
+    #if OS_NAME == OS_WINDOWS
+        #define debug_assert(expr) _ASSERTE(expr)
+        #define release_assert(expr)
+    #else
+        #define debug_assert(expr) assert(expr)
+        #define release_assert(expr)
+    #endif
+#else
+    #define debug_assert(expr)
+    #define release_assert(expr)
 #endif
 
-#ifdef _DEBUG
-    #if OS_NAME == OS_WINDOWS
-        #define debug_assert(expr) _ASSERTE(expr)
-        #define release_assert(expr)
-    #else
-        #define debug_assert(expr) assert(expr)
-        #define release_assert(expr)
-    #endif
-#else
-    #define debug_assert(expr)
-    #define release_assert(expr)
-#endif
-
 #if OS_NAME == OS_WINDOWS
     #define cxx_stricmp _stricmp
     #define cxx_strnicmp _strnicmp
@@ -48,4 +53,4 @@
     #define cxx_strnicmp strncasecmp
 #endif
 
-#define BIT(i) (1U << (i))
+#define BIT(i) (1U << (i))

src/path_utils.cpp

@@ -1,13 +1,15 @@
 #include "stdafx.h"
 #include "path_utils.h"
 
-#ifdef __EMSCRIPTEN__
+#if OS_NAME == OS_MACOS
+    namespace filesystem = std::filesystem;
+#elif defined(__EMSCRIPTEN__)
 #include <filesystem>
     namespace filesystem = std::__fs::filesystem;
 #else
 #include <experimental/filesystem>
-    namespace filesystem = std::experimental::filesystem;
-#endif // #ifndef __EMSCRIPTEN__
+    namespace filesystem = std::experimental::filesystem;
+#endif // #ifndef __EMSCRIPTEN__
 
 namespace cxx
 {
@@ -39,13 +41,22 @@ std::string get_file_extension(std::string pathto)
 std::string get_executable_path()
 {
 #if (OS_NAME == OS_WINDOWS)
-    char buffer[MAX_PATH + 1];
-    int count = ::GetModuleFileNameA(NULL, buffer, MAX_PATH);
+    char buffer[MAX_PATH + 1];
+    int count = ::GetModuleFileNameA(NULL, buffer, MAX_PATH);
     return std::string(buffer, (count > 0) ? count : 0);
 #elif (OS_NAME == OS_LINUX)
     char buffer[PATH_MAX];
     ssize_t count = readlink("/proc/self/exe", buffer, PATH_MAX);
     return std::string(buffer, (count > 0) ? count : 0);
+#elif (OS_NAME == OS_MACOS)
+    char buffer[PATH_MAX];
+    uint32_t count = sizeof(buffer);
+    if (_NSGetExecutablePath(buffer, &count) == 0) {
+        char resolved[PATH_MAX];
+        realpath(buffer, resolved);
+
+        return std::string(resolved, count);
+    }
 #else
     debug_assert(false);
     return std::string();
@@ -72,12 +83,12 @@ bool ensure_path_exists(std::string pathto)
 
 void enum_files(std::string pathto, enum_files_proc enumproc)
 {
-    filesystem::path sourcePath {pathto};
-    if (!filesystem::exists(sourcePath))
-        return;
-
+    filesystem::path sourcePath {pathto};
+    if (!filesystem::exists(sourcePath))
+        return;
+
     filesystem::directory_iterator iter_directory_end;
-    for (filesystem::directory_iterator iter_directory(sourcePath); 
+    for (filesystem::directory_iterator iter_directory(sourcePath);
         iter_directory != iter_directory_end; ++iter_directory)
     {
         const filesystem::path& currentFile = iter_directory->path();
@@ -87,17 +98,17 @@ void enum_files(std::string pathto, enum_files_proc enumproc)
 
 void enum_files_recursive(std::string pathto, enum_files_proc enumproc)
 {
-    filesystem::path sourcePath {pathto};
-    if (!filesystem::exists(sourcePath))
-        return;
-
+    filesystem::path sourcePath {pathto};
+    if (!filesystem::exists(sourcePath))
+        return;
+
     filesystem::recursive_directory_iterator iter_directory_end;
-    for (filesystem::recursive_directory_iterator iter_directory(sourcePath); 
+    for (filesystem::recursive_directory_iterator iter_directory(sourcePath);
         iter_directory != iter_directory_end; ++iter_directory)
     {
         const filesystem::path& currentFile = iter_directory->path();
         enumproc(currentFile.filename().generic_string());
     }
 }
 
-} // namespace cxx
+} // namespace cxx

src/stdafx.h

@@ -14,7 +14,7 @@
     #define NOMINMAX
     #include <windows.h>
     #include <mmsystem.h> // for multimedia timers
-#elif OS_NAME == OS_LINUX
+#elif OS_NAME == OS_LINUX || OS_NAME == OS_MACOS
     #include <limits.h>
     #include <unistd.h>
 #endif
@@ -52,8 +52,11 @@
 
 // opengl
 #include <GL/glew.h>
+#if OS_NAME == OS_MACOS
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
-
+#endif
 #include "GLFW/glfw3.h"
 
 // glm
@@ -102,4 +105,4 @@
 #include "GuiManager.h"
 #include "PixelsArray.h"
 #include "GameDefs.h"
-#include "Convert.h"
+#include "Convert.h"