Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

.github/workflows/macos.yml

@@ -0,0 +1,44 @@
+name: Macos Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build-dmg:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+
+      - name: Install dependencies from brew
+        run: |
+          brew install glfw3 glew libpng openal-soft luajit libvorbis
+
+      - name: Install specific version of GLM
+        run: |
+          curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/5c7655a866646aa4b857c002b8ae5465b9d26f65/Formula/g/glm.rb
+          brew install --formula glm.rb
+
+      - name: Configure
+        run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_APPDIR=1
+
+      - name: Build
+        run: cmake --build build -t install
+
+      - name: Create DMG
+        run: |
+          mkdir VoxelEngineDmgContent
+          cp -r build/res VoxelEngineDmgContent/
+          cp -r build/VoxelEngine VoxelEngineDmgContent/
+          hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: VoxelEngineMacOs
+          path: VoxelEngineMacApp.dmg

CMakeLists.txt

@@ -101,6 +101,18 @@ if (WIN32)
       set(VORBISLIB vorbis vorbisfile) # not tested
       add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
     endif()
+elseif(APPLE)
+    find_package(PkgConfig)
+    pkg_check_modules(LUAJIT REQUIRED luajit)
+    pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile)
+    set(LUA_INCLUDE_DIR "/opt/homebrew/include/luajit-2.1")
+    set(LUA_LIBRARIES "/opt/homebrew/lib/libluajit-5.1.a")
+    message(STATUS "LUA Libraries: ${LUA_LIBRARIES}")
+    message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}")
+    find_package(PNG REQUIRED)
+    set(PNGLIB PNG::PNG)
+    set(VORBISLIB ${VORBIS_LDFLAGS})
+    message(STATUS "Vorbis Lib: ${VORBIS_LDFLAGS}")
 else()
     find_package(PkgConfig)
     pkg_check_modules(LUAJIT REQUIRED luajit)