Additional changes for SDL2 include files.

Of course I had to miss some things..
This commit is contained in:
Leon Styhre 2020-06-26 18:11:24 +02:00
parent eeae8033bd
commit 5b17edde8b
3 changed files with 10 additions and 5 deletions

View file

@ -1,16 +1,21 @@
// //
// AudioManager.cpp // AudioManager.cpp
// //
// Low-level audio functions (using SDL). // Low-level audio functions (using SDL2).
// //
#include "AudioManager.h" #include "AudioManager.h"
#include "Log.h" #include "Log.h"
#include "SDL.h"
#include "Settings.h" #include "Settings.h"
#include "Sound.h" #include "Sound.h"
#ifdef __linux__
#include <SDL2/SDL.h>
#else
#include "SDL.h"
#endif
std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector; std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector;
SDL_AudioSpec AudioManager::sAudioFormat; SDL_AudioSpec AudioManager::sAudioFormat;
std::shared_ptr<AudioManager> AudioManager::sInstance; std::shared_ptr<AudioManager> AudioManager::sInstance;

View file

@ -1,7 +1,7 @@
// //
// AudioManager.h // AudioManager.h
// //
// Low-level audio functions (using SDL). // Low-level audio functions (using SDL2).
// //
#pragma once #pragma once

View file

@ -13,10 +13,10 @@
#ifdef __linux__ #ifdef __linux__
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_opengl.h> #include <SDL2/SDL_opengles.h>
#else #else
#include "SDL.h" #include "SDL.h"
#include "SDL_opengl.h" #include "SDL_opengles.h"
#endif #endif
namespace Renderer namespace Renderer