more cleanup

Signed-off-by: Daniel Thamdrup <[email protected]>
diasurgical · Feb 7, 2024 · 844b75e · 844b75e
1 parent 962f60e
commit 844b75e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,5 +1,6 @@
 version: 2
 jobs:
+<<<<<<< HEAD
 <<<<<<< HEAD
   switch:
     docker:
@@ -31,6 +32,8 @@ jobs:
       - run: cmake --build build -j 2
       - store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx}
       - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia}
+=======
+>>>>>>> 0256ae65c (more cleanup)
   amigaos-m68k:
     docker:
       - image: amigadev/crosstools:m68k-amigaos-gcc10

diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -38,15 +38,20 @@ jobs:
       - name: Install dependencies
         run: |
           apt-get update && \
+<<<<<<< HEAD
 <<<<<<< HEAD
           apt-get install -y --no-install-recommends --no-install-suggests \
 =======
           apt-get install -y \
 >>>>>>> 8c6884088 (add switch gha)
+=======
+          apt-get install -y --no-install-recommends --no-install-suggests \
+>>>>>>> ffcdecf17 (more cleanup)
             gettext
 
       - name: Configure CMake
         run: |
+<<<<<<< HEAD
 <<<<<<< HEAD
           cmake \
             -S . \
@@ -57,6 +62,11 @@ jobs:
           /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo
 >>>>>>> 8c6884088 (add switch gha)
+=======
+          cmake -S. -Bbuild \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+>>>>>>> ffcdecf17 (more cleanup)
 
       - name: Build DevilutionX
         run: cmake --build build -j$(nproc)