iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

avoid building tests and archs other than MIPS for capstone in CI

Browse Source
This commit is contained in:
Simone Coco
2022-09-17 21:40:38 +02:00
parent 71899ef9fa
commit bef4705ffa
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/build.yml vendored
View File

@@ -10,12 +10,19 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update -qq 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 sudo apt-get install -y vulkan-tools libvulkan1 libvulkan-dev vulkan-validationlayers-dev spirv-tools
- name: Build natsukashii - name: Build natsukashii
run: | run: |
cmake -B build -DCMAKE_BUILD_TYPE=Release -S src cmake \
make -j$(nproc) -C build -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 - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
@@ -37,16 +44,18 @@ jobs:
submodules: recursive submodules: recursive
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: 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 - name: Build natsukashii
run: | run: |
cmake \ cmake \
-G"Unix Makefiles" \ -G Ninja \
-B build \ -B build \
-DCAPSTONE_ARCHITECTURE_DEFAULT=OFF \
-DCAPSTONE_BUILD_TESTS=OFF \
-DCAPSTONE_MIPS_SUPPORT=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="-s" \
-S src -S src
make -j$(nproc) -C build ninja -j$(nproc) -C build
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload

2
src/frontend/App.cpp
View File

@@ -31,7 +31,7 @@ void App::Run() {
case SDLK_o: { case SDLK_o: {
nfdchar_t* outpath; nfdchar_t* outpath;
const nfdu8filteritem_t filter {"Nintendo 64 roms", "n64,z64,v64,N64,Z64,V64"}; 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) { if(result == NFD_OKAY) {
core.LoadROM(outpath); core.LoadROM(outpath);
NFD_FreePath(outpath); NFD_FreePath(outpath);

2
src/frontend/imgui/Window.cpp
View File

@@ -150,7 +150,7 @@ void Window::Render(n64::Core& core) {
if (ImGui::MenuItem("Open", "O")) { if (ImGui::MenuItem("Open", "O")) {
nfdchar_t *outpath; nfdchar_t *outpath;
const nfdu8filteritem_t filter{"Nintendo 64 roms", "n64,z64,v64,N64,Z64,V64"}; 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) { if (result == NFD_OKAY) {
core.LoadROM(outpath); core.LoadROM(outpath);
NFD_FreePath(outpath); NFD_FreePath(outpath);