Merge branch 'main' of github.com:HarbourMasters/Starship

4 files changed, 53 insertions, 35 deletions

diff --git a/.github/macports.yml b/.github/macports.yml
new file mode 100644
index 00000000..97622472
--- /dev/null
+++ b/.github/macports.yml
@@ -0,0 +1,21 @@
+ports:
+  - name: libsdl2
+    select: [ universal ]
+  - name: libpng
+    select: [ universal ]
+  - name: glew
+    select: [ universal ]
+  - name: libzip
+    select: [ universal ]
+  - name: nlohmann-json
+    select: [ universal ]
+  - name: tinyxml2
+    select: [ universal ]
+  - name: libogg
+    select: [ universal ]
+  - name: libopus
+    select: [ universal ]
+  - name: opusfile
+    select: [ universal ]
+  - name: libvorbis
+    select: [ universal ]
\ No newline at end of file
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index f70c52e2..569dcca2 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -6,24 +6,18 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Install dependencies
-        run: brew install sdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools
+      - uses: melusina-org/setup-macports@v1
+        with:
+          parameters: '.github/macports.yml'
+      - uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: macos # ccache-macos
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake -j
-      - name: Create Package
-        run: |
-          mkdir starship-release
-          mv build-cmake/Starship starship-release/
-      - name: Publish packaged artifacts
-        uses: actions/upload-artifact@v4
-        with:
-            name: starship-mac-x64
-            path: starship-release
-            retention-days: 1
\ No newline at end of file
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+          cmake --build build-cmake -j
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e6fc63f..6d98ae4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -75,17 +75,21 @@ jobs:
 
   build-macos:
     needs: generate-port-o2r
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Install dependencies
-        run: brew install sdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools
+      - uses: melusina-org/setup-macports@v1
+        with:
+          parameters: '.github/macports.yml'
+      - uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: macos # ccache-macos
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake --config Release -j3
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+          cmake --build build-cmake -j
       - name: Download starship.o2r
         uses: actions/download-artifact@v4
         with:
@@ -93,17 +97,16 @@ jobs:
           path: ./build-cmake
       - name: Create Package
         run: |
-          mkdir starship-release
-          mv build-cmake/Starship starship-release/
-          mv build-cmake/starship.o2r starship-release/
-          mv config.yml starship-release/
-          mv assets starship-release/
-          curl -o starship-release/gamecontrollerdb.txt -sSL 'https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt'
+          (cd build-cmake && cpack)
+          mv _packages/*.dmg Starship.dmg
+          mv README.md readme.txt
       - name: Publish packaged artifacts
         uses: actions/upload-artifact@v4
         with:
-            name: starship-mac-x64
-            path: starship-release
+          name: Starship-mac
+          path: |
+            Starship.dmg
+            readme.txt
 
   build-linux:
     needs: generate-port-o2r
@@ -181,7 +184,7 @@ jobs:
           cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
           cmake --build build-cmake --config Release -j3
           (cd build-cmake && cpack -G External)
-          wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt
           mv README.md readme.txt
           mv build-cmake/*.appimage starship.appimage
       - name: Upload build
@@ -208,14 +211,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake
-          git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
+          git -C libultraship remote add nx https://github.com/sonicdcer/libultraship.git
           git -C libultraship fetch nx
-          git -C libultraship checkout nx/main-nx
+          git -C libultraship checkout nx/main-nx_backup
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
           sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
           cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
           cmake --build build-switch --config Release -j3
-          wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt
           mv README.md readme.txt
           mv build-switch/*.nro Starship.nro
       - name: Upload build
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index 00f9a283..3d83c850 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -25,7 +25,7 @@ jobs:
           sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
           cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
           cmake --build build-switch --config Release -j3
-          wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt
           mv README.md readme.txt
           mv build-switch/*.nro Starship.nro
       - name: Upload build