cmake 0

.github/workflows/cmake.yml

@@ -1,56 +1,39 @@
-name: CMake
-
-# When creating a new workflow in GitHub’s action builder the default trigger is the push event. We want to extend this to push and pull request events.
-on: [push, pull_request]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Create Build Environment
-      run: brew bundle install
-
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      #working-directory: ${{github.workspace}}/build
-      #run: cmake ..
-      working-directory: ${{github.workspace}}
-      run: cmake -S. -Bbuild -D DEVILUTIONX_SYSTEM_SDL2=OFF
-
-    - name: Build
-      shell: bash
-      #working-directory: ${{github.workspace}}/build
-      #run: cmake --build . -j $(sysctl -n hw.physicalcpu) --target package
-      working-directory: ${{github.workspace}}
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build build -j $(sysctl -n hw.physicalcpu) --target package
-
-    #- name: Release
-    #  uses: softprops/action-gh-release@v1
-    #  if: startsWith(github.ref, 'refs/tags/')
-    #  with:
-    #    files: ${{github.workspace}}/build/devilutionx.dmg
-    #  env:
-    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    # Upload the created artifact
-    - name: Upload
-      if: ${{ !env.ACT }}
-      uses: actions/upload-artifact@v4
-      with:
-        path: ${{github.workspace}}/build/devilutionx.dmg
-        name: devilutionx.dmg
+name: CMake
+
+# When creating a new workflow in GitHub’s action builder the default trigger is the push event. We want to extend this to push and pull request events.
+on: [push, pull_request]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: amigadev/crosstools:m68k-amigaos-gcc10
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Run prep.sh script
+      run: Packaging/amiga/prep.sh
+      #run: Packaging/nix/debian-host-prep.sh
+
+    - name: Configure CMake
+      run: |
+        cmake -S. -Bbuild -GNinja \
+          -DM68K_COMMON="-s -ffast-math -O3" \
+          -DM68K_CPU=68040 \
+          -DM68K_FPU=hard
+
+    - name: Build DevilutionX
+      run: cmake --build build
+
+    - name: Upload Package
+      if: ${{ !env.ACT }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: devilutionx_m68k
+        path: ./build/devilutionx