From bef4705ffadd0752690e6798793c83d5229a164e Mon Sep 17 00:00:00 2001 From: Simone Coco Date: Sat, 17 Sep 2022 21:40:38 +0200 Subject: [PATCH] avoid building tests and archs other than MIPS for capstone in CI --- .github/workflows/build.yml | 23 ++++++++++++++++------- src/frontend/App.cpp | 2 +- src/frontend/imgui/Window.cpp | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7930c4cf..94798c87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,12 +10,19 @@ jobs: - name: Install dependencies run: | sudo apt-get update -qq - sudo apt-get install -y build-essential libgtk-3-dev libsdl2-dev libfmt-dev git + sudo apt-get install -y build-essential libgtk-3-dev libsdl2-dev libfmt-dev git ninja-build sudo apt-get install -y vulkan-tools libvulkan1 libvulkan-dev vulkan-validationlayers-dev spirv-tools - name: Build natsukashii run: | - cmake -B build -DCMAKE_BUILD_TYPE=Release -S src - make -j$(nproc) -C build + cmake \ + -G Ninja \ + -B build \ + -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF \ + -DCAPSTONE_BUILD_TESTS=OFF \ + -DCAPSTONE_MIPS_SUPPORT=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -S src + ninja -j$(nproc) -C build - name: Collect artifacts run: | mkdir upload @@ -37,16 +44,18 @@ jobs: submodules: recursive - uses: msys2/setup-msys2@v2 with: - install: make git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-vulkan-devel mingw-w64-x86_64-fmt + install: make git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-vulkan-devel mingw-w64-x86_64-fmt mingw-w64-x86_64-ninja - name: Build natsukashii run: | cmake \ - -G"Unix Makefiles" \ + -G Ninja \ -B build \ + -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF \ + -DCAPSTONE_BUILD_TESTS=OFF \ + -DCAPSTONE_MIPS_SUPPORT=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="-s" \ -S src - make -j$(nproc) -C build + ninja -j$(nproc) -C build - name: Collect artifacts run: | mkdir upload diff --git a/src/frontend/App.cpp b/src/frontend/App.cpp index 9363aee7..9fda13fc 100644 --- a/src/frontend/App.cpp +++ b/src/frontend/App.cpp @@ -31,7 +31,7 @@ void App::Run() { case SDLK_o: { nfdchar_t* outpath; const nfdu8filteritem_t filter {"Nintendo 64 roms", "n64,z64,v64,N64,Z64,V64"}; - nfdresult_t result = NFD_OpenDialog(&outpath, &filter, 1, "/run/media/simuuz/HDD/n64_roms/tests"); + nfdresult_t result = NFD_OpenDialog(&outpath, &filter, 1, nullptr); if(result == NFD_OKAY) { core.LoadROM(outpath); NFD_FreePath(outpath); diff --git a/src/frontend/imgui/Window.cpp b/src/frontend/imgui/Window.cpp index bf629a11..c131e7bc 100644 --- a/src/frontend/imgui/Window.cpp +++ b/src/frontend/imgui/Window.cpp @@ -150,7 +150,7 @@ void Window::Render(n64::Core& core) { if (ImGui::MenuItem("Open", "O")) { nfdchar_t *outpath; const nfdu8filteritem_t filter{"Nintendo 64 roms", "n64,z64,v64,N64,Z64,V64"}; - nfdresult_t result = NFD_OpenDialog(&outpath, &filter, 1, "/run/media/simuuz/HDD/n64_roms/tests"); + nfdresult_t result = NFD_OpenDialog(&outpath, &filter, 1, nullptr); if (result == NFD_OKAY) { core.LoadROM(outpath); NFD_FreePath(outpath);