Merge branch 'refs/heads/dev' into jit

This commit is contained in:
SimoneN64
2024-05-25 19:12:05 +02:00
5 changed files with 6 additions and 4 deletions

View File

@@ -5,7 +5,7 @@ on:
- master - master
jobs: jobs:
build-linux: build-linux:
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@master - uses: actions/checkout@master
with: with:
@@ -15,7 +15,7 @@ jobs:
sudo add-apt-repository universe sudo add-apt-repository universe
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y clang build-essential libgtk-3-dev libsdl2-dev git ninja-build qt6-base-dev sudo apt-get install -y clang build-essential libgtk-3-dev libsdl2-dev git ninja-build qt6-base-dev
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-utility-libraries-dev spirv-tools
- name: Build Kaizen - name: Build Kaizen
run: | run: |
cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -DCMAKE_BUILD_TYPE=Release cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -DCMAKE_BUILD_TYPE=Release

View File

@@ -1,5 +1,6 @@
#include <Audio.hpp> #include <Audio.hpp>
#include <log.hpp> #include <log.hpp>
#include <SDL2/SDL.h>
namespace n64 { namespace n64 {
#define AUDIO_SAMPLE_RATE 44100 #define AUDIO_SAMPLE_RATE 44100

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include <MemoryHelpers.hpp> #include <MemoryHelpers.hpp>
#include <SDL2/SDL.h> #include <SDL2/SDL_audio.h>
namespace n64 { namespace n64 {
struct AudioDevice { struct AudioDevice {

View File

@@ -2,6 +2,7 @@
#include <RenderWidget.hpp> #include <RenderWidget.hpp>
#include <ParallelRDPWrapper.hpp> #include <ParallelRDPWrapper.hpp>
#include "Audio.hpp" #include "Audio.hpp"
#include <SDL2/SDL.h>
EmuThread::EmuThread(std::unique_ptr<QtInstanceFactory>&& instance_, std::unique_ptr<Vulkan::WSIPlatform>&& wsiPlatform_, std::unique_ptr<ParallelRDP::WindowInfo>&& windowInfo_, SettingsWindow& settings) noexcept EmuThread::EmuThread(std::unique_ptr<QtInstanceFactory>&& instance_, std::unique_ptr<Vulkan::WSIPlatform>&& wsiPlatform_, std::unique_ptr<ParallelRDP::WindowInfo>&& windowInfo_, SettingsWindow& settings) noexcept
: instance(std::move(instance_)), wsiPlatform(std::move(wsiPlatform_)), : instance(std::move(instance_)), wsiPlatform(std::move(wsiPlatform_)),

View File

@@ -4,7 +4,7 @@
#include <Core.hpp> #include <Core.hpp>
#include <SettingsWindow.hpp> #include <SettingsWindow.hpp>
#include <memory> #include <memory>
#include <SDL2/SDL.h> #include <SDL2/SDL_gamecontroller.h>
class EmuThread : public QThread class EmuThread : public QThread
{ {