diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55cc87ee41..31587ef2dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,9 +25,9 @@ jobs: - name: Install dependencies run: brew install ninja - name: Configure - run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF + run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF - name: Build - run: ninja -C build dolphin-emu-nogui + run: ninja -C build core nogui-linux: runs-on: ubuntu-24.04 @@ -43,9 +43,9 @@ jobs: libbluetooth-dev libasound2-dev libpulse-dev libgl1-mesa-dev \ libxrandr-dev libxi-dev - name: Configure - run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF + run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF - name: Build - run: ninja -C build dolphin-emu-nogui + run: ninja -C build core # The unit tests exist but nothing ran them. `tests` is EXCLUDE_FROM_ALL, # so it has to be asked for by name. - name: Build unit tests @@ -67,9 +67,9 @@ jobs: run: choco install ninja --no-progress -y - uses: ilammy/msvc-dev-cmd@v1 - name: Configure - run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF + run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT=OFF -DENABLE_NOGUI=ON -DUSE_MGBA=OFF -DUSE_RETRO_ACHIEVEMENTS=OFF - name: Build - run: ninja -C build dolphin-emu-nogui + run: ninja -C build core - name: Build unit tests run: ninja -C build tests - name: Test diff --git a/DolRecomp b/DolRecomp index 48c4ef11dd..fa0cf619e8 160000 --- a/DolRecomp +++ b/DolRecomp @@ -1 +1 @@ -Subproject commit 48c4ef11dd59c7367a3479a433e39a35bda80695 +Subproject commit fa0cf619e8d7eb8cba7eaf55267a12caaebb46aa diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 659d9e5b28..7b03f71e4c 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -5,6 +5,7 @@ add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND} "- string(APPEND CMAKE_RUNTIME_OUTPUT_DIRECTORY "/Tests") add_executable(tests EXCLUDE_FROM_ALL UnitTestsMain.cpp StubHost.cpp) +target_sources(tests PRIVATE ../../GXRuntime/src/core/cpu_exception.c) set_target_properties(tests PROPERTIES FOLDER Tests) target_link_libraries(tests PRIVATE fmt::fmt gtest::gtest core uicommon) add_test(NAME tests COMMAND tests)