Merge branch 'refs/heads/dev'

SimoneN64 · May 25, 2024 · 83f3571 · 83f3571
2 parents bce60e5 + 6003f02
commit 83f3571
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/backend/core/mmio/Audio.cpp b/src/backend/core/mmio/Audio.cpp
@@ -1,5 +1,6 @@
 #include <Audio.hpp>
 #include <log.hpp>
+#include <SDL2/SDL.h>
 
 namespace n64 {
 #define AUDIO_SAMPLE_RATE 44100

diff --git a/src/backend/core/mmio/Audio.hpp b/src/backend/core/mmio/Audio.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <MemoryHelpers.hpp>
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_audio.h>
 
 namespace n64 {
 struct AudioDevice {

diff --git a/src/frontend/EmuThread.cpp b/src/frontend/EmuThread.cpp
@@ -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_)),

diff --git a/src/frontend/EmuThread.hpp b/src/frontend/EmuThread.hpp
@@ -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
 {