From 5b17edde8bfc96a2aaa72e21fcd4f56791d27605 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Fri, 26 Jun 2020 18:11:24 +0200 Subject: [PATCH] Additional changes for SDL2 include files. Of course I had to miss some things.. --- es-core/src/AudioManager.cpp | 9 +++++++-- es-core/src/AudioManager.h | 2 +- es-core/src/renderers/Renderer_GLES10.cpp | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/es-core/src/AudioManager.cpp b/es-core/src/AudioManager.cpp index ac1b7ce11..115a9225b 100644 --- a/es-core/src/AudioManager.cpp +++ b/es-core/src/AudioManager.cpp @@ -1,16 +1,21 @@ // // AudioManager.cpp // -// Low-level audio functions (using SDL). +// Low-level audio functions (using SDL2). // #include "AudioManager.h" #include "Log.h" -#include "SDL.h" #include "Settings.h" #include "Sound.h" +#ifdef __linux__ +#include +#else +#include "SDL.h" +#endif + std::vector> AudioManager::sSoundVector; SDL_AudioSpec AudioManager::sAudioFormat; std::shared_ptr AudioManager::sInstance; diff --git a/es-core/src/AudioManager.h b/es-core/src/AudioManager.h index 68d5849e7..adbe349a6 100644 --- a/es-core/src/AudioManager.h +++ b/es-core/src/AudioManager.h @@ -1,7 +1,7 @@ // // AudioManager.h // -// Low-level audio functions (using SDL). +// Low-level audio functions (using SDL2). // #pragma once diff --git a/es-core/src/renderers/Renderer_GLES10.cpp b/es-core/src/renderers/Renderer_GLES10.cpp index 96310cfc4..fd87c23c5 100644 --- a/es-core/src/renderers/Renderer_GLES10.cpp +++ b/es-core/src/renderers/Renderer_GLES10.cpp @@ -13,10 +13,10 @@ #ifdef __linux__ #include -#include +#include #else #include "SDL.h" -#include "SDL_opengl.h" +#include "SDL_opengles.h" #endif namespace Renderer