From 83e6a0ea176e88eefe45157a8e4775388d539fa6 Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Tue, 21 May 2024 18:47:45 +0200 Subject: [PATCH 1/4] Attempt at fixing Linux CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb10b67d..1a1cdb5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: - master jobs: build-linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@master with: From 6249bf29370c9c58685b32e30290329ac11939cc Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Sun, 26 May 2024 11:48:34 +0200 Subject: [PATCH 2/4] update submodules --- external/nativefiledialog-extended | 2 +- external/parallel-rdp/parallel-rdp-standalone | 2 +- external/unarr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/nativefiledialog-extended b/external/nativefiledialog-extended index dbd7139b..17b6e8ce 160000 --- a/external/nativefiledialog-extended +++ b/external/nativefiledialog-extended @@ -1 +1 @@ -Subproject commit dbd7139b4eb7372813cfd0d58d3fa1f355763f3d +Subproject commit 17b6e8ce219c0677f94b63636abb9296b28841ca diff --git a/external/parallel-rdp/parallel-rdp-standalone b/external/parallel-rdp/parallel-rdp-standalone index 75941df9..1504f300 160000 --- a/external/parallel-rdp/parallel-rdp-standalone +++ b/external/parallel-rdp/parallel-rdp-standalone @@ -1 +1 @@ -Subproject commit 75941df9bf1f08f5d146c183f2fbde74557bfd05 +Subproject commit 1504f3007e91258d4cd25869eceefc47f4be521f diff --git a/external/unarr b/external/unarr index c5f94235..f243d72f 160000 --- a/external/unarr +++ b/external/unarr @@ -1 +1 @@ -Subproject commit c5f9423568ac047aed9aebe2b1e404961ef7d2b3 +Subproject commit f243d72fb3fe418c26a19514609ac7167d089df4 From 9721042e901f00bcc5a7cc4c4f54dcb1a5e98a78 Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Sun, 26 May 2024 20:00:12 +0200 Subject: [PATCH 3/4] Thanks TheMaister --- external/parallel-rdp/CMakeLists.txt | 2 ++ src/frontend/RenderWidget.hpp | 1 + 2 files changed, 3 insertions(+) diff --git a/external/parallel-rdp/CMakeLists.txt b/external/parallel-rdp/CMakeLists.txt index 83d10880..c482bc76 100644 --- a/external/parallel-rdp/CMakeLists.txt +++ b/external/parallel-rdp/CMakeLists.txt @@ -41,6 +41,8 @@ add_library(parallel-rdp parallel-rdp-standalone/util/logging.hpp parallel-rdp-standalone/util/thread_id.cpp parallel-rdp-standalone/util/thread_id.hpp + parallel-rdp-standalone/util/environment.cpp + parallel-rdp-standalone/util/environment.hpp # C parallel-rdp-standalone/volk/volk.c ) diff --git a/src/frontend/RenderWidget.hpp b/src/frontend/RenderWidget.hpp index 2b1b3806..543a5ab9 100644 --- a/src/frontend/RenderWidget.hpp +++ b/src/frontend/RenderWidget.hpp @@ -72,6 +72,7 @@ public: } void poll_input() override {} + void poll_input_async(Granite::InputTrackerHandler* handler) override {} void event_frame_tick(double frame, double elapsed) override { } From f6afa56987de5e199b349a6507e93a9c44e258cd Mon Sep 17 00:00:00 2001 From: SimoneN64 Date: Sun, 26 May 2024 21:11:39 +0200 Subject: [PATCH 4/4] Stop Windows support indefinitely --- .github/workflows/build.yml | 32 -------------------------------- CMakeLists.txt | 7 +------ README.md | 21 ++------------------- 3 files changed, 3 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e54cfd0..355c6c86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,36 +29,4 @@ jobs: with: name: kaizen-linux path: upload - if-no-files-found: error - build-windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@master - with: - submodules: recursive - - name: Setup dependencies - run: | - vcpkg install sdl2[vulkan]:x64-windows - - name: Setup Qt - uses: jurplel/install-qt-action@v3 - with: - arch: win64_msvc2019_64 - version: 6.6.* - - name: Build Kaizen - run: | - cmake -B build -T clangcl -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release - - name: Collect artifacts - run: | - mkdir upload - cp build/src/frontend/Release/kaizen-qt.exe upload - mkdir upload/resources - cp resources/* upload/resources - cp build/src/frontend/Release/SDL2.dll upload - windeployqt --dir upload upload/kaizen-qt.exe - - name: Upload artifacts - uses: actions/upload-artifact@master - with: - name: kaizen-windows - path: upload if-no-files-found: error \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f6e1226..596aeba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,17 +2,12 @@ cmake_minimum_required(VERSION 3.20) set(CMAKE_CXX_STANDARD 17) -add_compile_definitions(SIMD_SUPPORT) -if(WIN32) - add_definitions(-DNOMINMAX) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -endif () - include(CheckCCompilerFlag) check_c_compiler_flag(-msse4.1 HAS_SSE4_1) if (HAS_SSE4_1) + add_compile_definitions(SIMD_SUPPORT) add_compile_options(-msse3 -msse4.1) endif () diff --git a/README.md b/README.md index 6cb30c78..da13e2b3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibu ## Pre-built binaries | Release | |--------------------------------------------------------------------------------------------| -| [Windows](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-windows.zip) | | [ Linux ](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-linux.zip) | ## Socials @@ -29,23 +28,6 @@ We have a [Discord server](https://discord.gg/htzNd2rRF6) ## Build instructions: First clone the repository: `git clone --recursive https://github.com/SimoneN64/Kaizen` -### Windows - -This build uses Visual Studio with Vcpkg and Clang-cl - -Dependencies: -- CMake 3.20 or higher -- SDL2 (install it by making sure that you're choosing the "vulkan" extension of the package and the x64-windows triplet: `vcpkg install sdl2[vulkan]:x64-windows`) -- Qt6 (install it with `vcpkg install qtbase[core,gui,widgets,vulkan]:x64-windows`) - -``` -cd path/to/kaizen -mkdir build -cd build -cmake -T clangcl -DCMAKE_TOOLCHAIN_FILE=path/to/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S ../src -cmake --build . --config Release -``` - ### Linux Dependencies: @@ -82,6 +64,7 @@ Your GPU needs to support Vulkan 1.1+, because the RDP is implemented via [ParaL - [ ] TAS tools: TAS input, recording (using Mupen's format), save-states, rewind and frame-advance - [ ] Cheat support - [ ] Allow to optionally pass a PIF image for the boot process (it's HLE'd at the moment) +- [ ] Windows support when it stops being a pain in the rectum. This list will probably grow with time! @@ -91,7 +74,7 @@ This list will probably grow with time! - [WhoBrokeTheBuild](https://github.com/WhoBrokeTheBuild) for the shader that allows letterboxing :rocket: - [Kelpsy](https://github.com/kelpsyberry), [fleroviux](https://github.com/fleroviux), [Kim-Dewelski](https://github.com/Kim-Dewelski), [Peach](https://github.com/wheremyfoodat/), [kivan](https://github.com/kivan117), [liuk](https://github.com/liuk7071) and [Skyler](https://github.com/skylersaleh) for the general support and motivation :heart: -- [Spec](https://github.com/spec-chum/) for help with testing on Windows, that helped form the final build instructions :heart: +- [Spec](https://github.com/spec-chum/) for being an awesome person in general :heart: ## Copyright