Merge branch 'refs/heads/dev' into jit
This commit is contained in:
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -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:
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
sudo add-apt-repository universe
|
||||
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 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
|
||||
run: |
|
||||
cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <Audio.hpp>
|
||||
#include <log.hpp>
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
namespace n64 {
|
||||
#define AUDIO_SAMPLE_RATE 44100
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include <MemoryHelpers.hpp>
|
||||
#include <SDL2/SDL.h>
|
||||
#include <SDL2/SDL_audio.h>
|
||||
|
||||
namespace n64 {
|
||||
struct AudioDevice {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <RenderWidget.hpp>
|
||||
#include <ParallelRDPWrapper.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
|
||||
: instance(std::move(instance_)), wsiPlatform(std::move(wsiPlatform_)),
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <Core.hpp>
|
||||
#include <SettingsWindow.hpp>
|
||||
#include <memory>
|
||||
#include <SDL2/SDL.h>
|
||||
#include <SDL2/SDL_gamecontroller.h>
|
||||
|
||||
class EmuThread : public QThread
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user