Merge remote-tracking branch 'origin/master' into rtconfig

.ci/dependencies_msys.txt

@@ -12,3 +12,4 @@ libslirp
 fluidsynth
 qt5-static
 qt5-translations
+vulkan-headers

.editorconfig

@@ -5,34 +5,11 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-# Disabled for now since not all editors support setting a tab_width value different from indent_size
-# Relevant VSCode extension issue: https://github.com/editorconfig/editorconfig-vscode/issues/190
-# [*.rc]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
-# [Makefile.*]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
 [*.manifest]
-indent_style = space
 indent_size = 2
 
 [*.yml]
-indent_style = space
 indent_size = 2
 
-[**/CMakeLists.txt]
-indent_style = space
-indent_size = 4
-
-[*.cmake]
-indent_style = space
-indent_size = 4
-
-[*.json]
-indent_style = space
-indent_size = 4
+[*.ui]
+indent_size = 1

.gitattributes

@@ -3,12 +3,28 @@
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
+#  Code
 *.c text
 *.cc text
 *.cpp text
 *.h text
 *.hpp text
+
+#  CMake scripts
+CMakeLists.txt text
+*.cmake text
+
+#  Windows resource scripts and manifests
 *.rc text
+*.manifest text
+
+#  Translation files
+*.po text
+
+#  Qt XML files
+*.ui text
+*.ts text
+*.qrc text
 
 
 # Declare files that will always have CRLF line endings on checkout.

.github/workflows/cmake_linux.yml

@@ -8,7 +8,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/cmake.yml
+      - .github/workflows/cmake_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -19,7 +19,7 @@ on:
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
       - .github/workflows/**
-      - .github/workflows/cmake.yml
+      - .github/workflows/cmake_linux.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -80,7 +80,6 @@ jobs:
           libopenal-dev
           libslirp-dev
           libfluidsynth-dev
-          libvncserver-dev
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
@@ -89,7 +88,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
 
       - name: Configure CMake
         run: >-
@@ -116,7 +115,7 @@ jobs:
           cmake --install build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**

.github/workflows/cmake_macos.yml

@@ -8,7 +8,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/cmake.yml
+      - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -19,7 +19,7 @@ on:
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
       - .github/workflows/**
-      - .github/workflows/cmake.yml
+      - .github/workflows/cmake_macos.yml
       - vcpkg.json
       - "!**/Makefile*"
 
@@ -76,13 +76,10 @@ jobs:
         run: >-
           brew install
           ninja
-          freetype
           sdl2
-          libpng
           rtmidi
           openal-soft
           fluidsynth
-          libvncserver
           ${{ matrix.ui.packages }}
 
       - name: Checkout repository
@@ -91,7 +88,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
 
       - name: Configure CMake
         run: >-
@@ -121,7 +118,106 @@ jobs:
           cmake --install build
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
+
+  macos14-arm64:
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, arm64"
+
+    runs-on: macos-14
+
+#    env:
+#      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+
+    strategy:
+      fail-fast: true
+      matrix:
+        build:
+#          - name: Regular
+#            preset: regular
+          - name: Debug
+            preset: debug
+            slug: -Debug
+          - name: Dev
+            preset: experimental
+            slug: -Dev
+        dynarec:
+#          - name: ODR
+#            new: off
+#            slug: -ODR
+          - name: NDR
+            new: on
+            slug: -NDR
+        ui:
+          - name: SDL GUI
+            qt: off
+            static: on
+            src-packages: >-
+              libsndfile
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qt@5
+            src-packages: >-
+              libsndfile
+
+    steps:
+      - name: Install source dependencies
+        run: >-
+          brew reinstall -s
+          ${{ matrix.ui.src-packages }}
+
+      - name: Install dependencies
+        run: >-
+          brew install
+          ninja
+          sdl2
+          rtmidi
+          openal-soft
+          fluidsynth
+          libslirp
+          ${{ matrix.ui.packages }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+#      - name: Install sonar-scanner and build-wrapper
+#        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
+
+      - name: Configure CMake
+        run: >-
+          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
+          --toolchain ./cmake/llvm-macos-aarch64.cmake
+          -D NEW_DYNAREC=${{ matrix.dynarec.new }}
+          -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
+          -D Qt5_ROOT=$(brew --prefix qt@5)
+          -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
+          -D OpenAL_ROOT=$(brew --prefix openal-soft)
+
+      - name: Build
+        run: |
+          cmake --build build
+
+#      - name: Run sonar-scanner
+#        if: 0
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#        run: |
+#          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+
+      - name: Generate package
+        run: |
+          cmake --install build
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-arm64-gha${{ github.run_number }}'
+          path: build/artifacts/**