1.6.0-development

.circleci/config.yml

@@ -30,7 +30,7 @@ jobs:
       - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia}
   amigaos-m68k:
     docker:
-      - image: amigadev/crosstools:m68k-amigaos
+      - image: amigadev/crosstools:m68k-amigaos-gcc10
     working_directory: ~/repo
     steps:
       - checkout

.github/workflows/Android.yml

@@ -38,8 +38,8 @@ jobs:
       uses: actions/cache@v3
       with:
         path: android-project/app/.cxx
-        key: ${{ github.workflow }}-v2-${{ github.sha }}
-        restore-keys: ${{ github.workflow }}-v2-
+        key: ${{ github.workflow }}-v3-${{ github.sha }}
+        restore-keys: ${{ github.workflow }}-v3-
 
     - name: Build
       working-directory: ${{github.workspace}}

.github/workflows/Linux_aarch64.yml

@@ -29,19 +29,40 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Create Build Environment
+    # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
+    # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
+    - name: Work around broken packages
+      run: sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
+
+    - name: Add clang repo
+      run: |
+        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+        sudo tee /etc/apt/sources.list.d/clang.list <<LIST
+        deb [arch=amd64,arm64] http://apt.llvm.org/focal/ llvm-toolchain-focal main
+        deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal main
+        LIST
+
+    # Installs dependencies, including arm64 libraries (runs `sudo apt-get update` as part of it)
+    - name: Install dependencies
+      run: Packaging/nix/debian-cross-aarch64-prep.sh --no-gcc
+
+    - name: Install clang-18
       run: |
-        # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
-        # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
-        sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
-        Packaging/nix/debian-cross-aarch64-prep.sh
+        sudo apt-get install -yq --no-install-recommends clang-18 lld-18 libc++-18-dev:arm64 \
+          libgcc-10-dev-arm64-cross binutils-aarch64-linux-gnu && \
+        sudo update-alternatives --install \
+          /usr/bin/clang++ clang++ /usr/bin/clang++-18 200 && \
+        sudo update-alternatives --install \
+          /usr/bin/clang clang /usr/bin/clang-18 200 \
+          --slave /usr/bin/lld lld /usr/bin/lld-18 \
+          --slave /usr/bin/ld.lld ld.lld /usr/bin/ld.lld-18
 
     - name: Cache CMake build folder
       uses: actions/cache@v3
       with:
         path: build
-        key: ${{ github.workflow }}-v2-${{ github.sha }}
-        restore-keys: ${{ github.workflow }}-v2-
+        key: ${{ github.workflow }}-v6-${{ github.sha }}
+        restore-keys: ${{ github.workflow }}-v6-
 
     - name: Build
       working-directory: ${{github.workspace}}
@@ -51,7 +72,7 @@ jobs:
       # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
       # We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
       run: |
-        cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/aarch64-linux-gnu.toolchain.cmake \
+        cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/aarch64-linux-gnu-clang-static-libc++.toolchain.cmake \
           -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
           -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
         cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package

.github/workflows/Linux_x86.yml

@@ -29,19 +29,31 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Create Build Environment
+    # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
+    # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
+    - name: Work around broken packages
+      run: sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
+
+    - name: Add gcc repo
+      run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+
+    # Installs dependencies, including x86 libraries (runs `sudo apt-get update` as part of it)
+    - name: Install dependencies
+      run: Packaging/nix/debian-cross-i386-prep.sh --no-gcc
+
+    - name: Install gcc-13
       run: |
-        # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
-        # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
-        sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
-        Packaging/nix/debian-cross-i386-prep.sh
+        sudo apt-get install -yq --no-install-recommends gcc-13 g++-13 g++-13-multilib && \
+        sudo update-alternatives --install \
+          /usr/bin/gcc gcc /usr/bin/gcc-13 13 \
+          --slave /usr/bin/g++ g++ /usr/bin/g++-13
 
     - name: Cache CMake build folder
       uses: actions/cache@v3
       with:
         path: build
-        key: ${{ github.workflow }}-v3-${{ github.sha }}
-        restore-keys: ${{ github.workflow }}-v3-
+        key: ${{ github.workflow }}-v5-${{ github.sha }}
+        restore-keys: ${{ github.workflow }}-v5-
 
     - name: Build
       working-directory: ${{github.workspace}}

.github/workflows/Linux_x86_64.yml

@@ -29,15 +29,29 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Add gcc repo
+      run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+
+    # Installs dependencies and runs `sudo apt-get update` as part of it.
+    - name: Install dependencies
+      run: Packaging/nix/debian-host-prep.sh --no-gcc
+
+    - name: Install gcc-13
+      run: |
+        sudo apt-get install -yq --no-install-recommends gcc-13 g++-13 && \
+        sudo update-alternatives --install \
+          /usr/bin/gcc gcc /usr/bin/gcc-13 13 \
+          --slave /usr/bin/g++ g++ /usr/bin/g++-13
+
     - name: Create Build Environment
-      run: Packaging/nix/debian-host-prep.sh
+      run: Packaging/nix/debian-host-prep.sh --no-gcc
 
     - name: Cache CMake build folder
       uses: actions/cache@v3
       with:
         path: build
-        key: ${{ github.workflow }}-v2-${{ github.sha }}
-        restore-keys: ${{ github.workflow }}-v2-
+        key: ${{ github.workflow }}-v5-${{ github.sha }}
+        restore-keys: ${{ github.workflow }}-v5-
 
     - name: Build
       working-directory: ${{github.workspace}}

.github/workflows/Linux_x86_64_test.yml

@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3

3rdParty/libmpq/CMakeLists.txt

@@ -10,8 +10,8 @@ include(functions/FetchContent_MakeAvailableExcludeFromAll)
 
 include(FetchContent)
 FetchContent_Declare(libmpq
-    URL https://github.com/diasurgical/libmpq/archive/b78d66c6fee6a501cc9b95d8556a129c68841b05.tar.gz
-    URL_HASH MD5=da531a1a6f719e89798a26e679ffc329
+    URL https://github.com/diasurgical/libmpq/archive/34ace76ecb18c3c72300a6b8352ca0c96333488d.tar.gz
+    URL_HASH MD5=e76ab7e4f9dfd7f96c152dd7d8418fee
 )
 FetchContent_MakeAvailableExcludeFromAll(libmpq)
 

3rdParty/libzt/CMakeLists.txt

@@ -5,7 +5,7 @@ set(BUILD_HOST_SELFTEST OFF)
 include(FetchContent)
 FetchContent_Declare(libzt
   GIT_REPOSITORY https://github.com/diasurgical/libzt.git
-  GIT_TAG d6c6a069a5041a3e89594c447ced3f15d77618b8)
+  GIT_TAG def49803307920da0ab5b9e9b70b399fdc2943dc)
 FetchContent_MakeAvailableExcludeFromAll(libzt)
 
 if(NOT ANDROID)