From d2d8a97a09cb84c721474b4f189784b60234a7d6 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Mon, 8 Aug 2016 17:27:17 +0200 Subject: [PATCH] Fix SDL2 #include paths --- rwgame/GameWindow.hpp | 2 +- rwgame/RWGame.hpp | 2 +- rwgame/State.hpp | 3 ++- rwgame/states/BenchmarkState.hpp | 1 - rwgame/states/DebugState.hpp | 1 - rwgame/states/IngameState.hpp | 1 - rwgame/states/LoadingState.hpp | 1 - rwgame/states/MenuState.hpp | 1 - rwgame/states/PauseState.hpp | 1 - 9 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rwgame/GameWindow.hpp b/rwgame/GameWindow.hpp index bed90396..7e11696d 100644 --- a/rwgame/GameWindow.hpp +++ b/rwgame/GameWindow.hpp @@ -2,7 +2,7 @@ #define GAMEWINDOW_HPP #include -#include +#include "SDL.h" #include #include diff --git a/rwgame/RWGame.hpp b/rwgame/RWGame.hpp index 19d77bc3..c785e2f6 100644 --- a/rwgame/RWGame.hpp +++ b/rwgame/RWGame.hpp @@ -12,7 +12,7 @@ #include "GameConfig.hpp" #include "GameWindow.hpp" -#include +#include "SDL.h" class PlayerController; diff --git a/rwgame/State.hpp b/rwgame/State.hpp index d0f089a0..ac1d0ba6 100644 --- a/rwgame/State.hpp +++ b/rwgame/State.hpp @@ -5,7 +5,8 @@ #include #include "MenuSystem.hpp" #include -#include +#include "SDL.h" +#include "SDL_events.h" #include "GameWindow.hpp" class RWGame; diff --git a/rwgame/states/BenchmarkState.hpp b/rwgame/states/BenchmarkState.hpp index 2fc23582..0f1f1fb8 100644 --- a/rwgame/states/BenchmarkState.hpp +++ b/rwgame/states/BenchmarkState.hpp @@ -1,7 +1,6 @@ #ifndef _RWGAME_BENCHMARKSTATE_HPP_ #define _RWGAME_BENCHMARKSTATE_HPP_ -#include #include "State.hpp" class BenchmarkState : public State diff --git a/rwgame/states/DebugState.hpp b/rwgame/states/DebugState.hpp index c7441fe5..69911f79 100644 --- a/rwgame/states/DebugState.hpp +++ b/rwgame/states/DebugState.hpp @@ -1,7 +1,6 @@ #ifndef DEBUGSTATE_HPP #define DEBUGSTATE_HPP -#include #include "State.hpp" class DebugState : public State diff --git a/rwgame/states/IngameState.hpp b/rwgame/states/IngameState.hpp index 6bf42d12..3061c5d8 100644 --- a/rwgame/states/IngameState.hpp +++ b/rwgame/states/IngameState.hpp @@ -1,7 +1,6 @@ #ifndef INGAMESTATE_HPP #define INGAMESTATE_HPP -#include #include "State.hpp" class PlayerController; diff --git a/rwgame/states/LoadingState.hpp b/rwgame/states/LoadingState.hpp index 59e7bfcd..2f5f0cef 100644 --- a/rwgame/states/LoadingState.hpp +++ b/rwgame/states/LoadingState.hpp @@ -1,7 +1,6 @@ #ifndef LOADINGSTATE_HPP #define LOADINGSTATE_HPP -#include #include "State.hpp" class LoadingState : public State diff --git a/rwgame/states/MenuState.hpp b/rwgame/states/MenuState.hpp index 8fa01e0d..320f3b34 100644 --- a/rwgame/states/MenuState.hpp +++ b/rwgame/states/MenuState.hpp @@ -1,7 +1,6 @@ #ifndef MENUSTATE_HPP #define MENUSTATE_HPP -#include #include "State.hpp" class MenuState : public State diff --git a/rwgame/states/PauseState.hpp b/rwgame/states/PauseState.hpp index 8fa9c5ed..7582fdea 100644 --- a/rwgame/states/PauseState.hpp +++ b/rwgame/states/PauseState.hpp @@ -1,7 +1,6 @@ #ifndef PAUSESTATE_HPP #define PAUSESTATE_HPP -#include #include "State.hpp" class PauseState : public State