ref: dacd34072ad8bda281cc55136484e1962a3daa3c
parent: 616b9cda9e94d3bb026bd1b79dd57f9a2187cbc0
author: Clownacy <Clownacy@users.noreply.github.com>
date: Wed May 6 18:52:11 EDT 2020
Fix everything after the last commit
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,48 +352,47 @@
if(BACKEND_PLATFORM MATCHES "SDL2")
target_sources(CSE2 PRIVATE
- "src/Backends/SDL2/Controller.cpp"
- "src/Backends/SDL2/Controller.h"
- "src/Backends/SDL2/Misc.cpp"
- "src/Backends/SDL2/Window.h"
+ "src/Backends/Controller/SDL2.cpp"
+ "src/Backends/Platform/SDL2.cpp"
+ "src/Backends/Shared/SDL2.h"
)
elseif(BACKEND_PLATFORM MATCHES "GLFW3")
target_sources(CSE2 PRIVATE
- "src/Backends/GLFW3/Controller.cpp"
- "src/Backends/GLFW3/Misc.cpp"
- "src/Backends/GLFW3/Window.h"
+ "src/Backends/Controller/GLFW3.cpp"
+ "src/Backends/Platform/GLFW3.cpp"
+ "src/Backends/Shared/GLFW3.h"
)
elseif(BACKEND_PLATFORM MATCHES "WiiU")
target_sources(CSE2 PRIVATE
- "src/Backends/WiiU/Controller.cpp"
- "src/Backends/WiiU/Misc.cpp"
+ "src/Backends/Controller/WiiU.cpp"
+ "src/Backends/Platform/WiiU.cpp"
)
elseif(BACKEND_PLATFORM MATCHES "Null")
target_sources(CSE2 PRIVATE
- "src/Backends/Null/Controller.cpp"
- "src/Backends/Null/Misc.cpp"
+ "src/Backends/Controller/Null.cpp"
+ "src/Backends/Platform/Null.cpp"
)
endif()
if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3")
- target_sources(CSE2 PRIVATE "src/Backends/SDL2/Window-OpenGL3.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.cpp")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGLES2")
- target_sources(CSE2 PRIVATE "src/Backends/SDL2/Window-OpenGLES2.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGLES2.cpp")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLTexture")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLSurface")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "Software")
- target_sources(CSE2 PRIVATE "src/Backends/SDL2/Window-Software.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-Software.cpp")
elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGL3")
- target_sources(CSE2 PRIVATE "src/Backends/GLFW3/Window-OpenGL3.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.cpp")
elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGLES2")
- target_sources(CSE2 PRIVATE "src/Backends/GLFW3/Window-OpenGLES2.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGLES2.cpp")
elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "Software")
- target_sources(CSE2 PRIVATE "src/Backends/GLFW3/Window-Software.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-Software.cpp")
elseif(BACKEND_PLATFORM MATCHES "WiiU" AND BACKEND_RENDERER MATCHES "WiiU")
elseif(BACKEND_PLATFORM MATCHES "WiiU" AND BACKEND_RENDERER MATCHES "Software")
- target_sources(CSE2 PRIVATE "src/Backends/WiiU/Window-Software.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/WiiU-Software.cpp")
elseif(BACKEND_PLATFORM MATCHES "Null" AND BACKEND_RENDERER MATCHES "Software")
- target_sources(CSE2 PRIVATE "src/Backends/Null/Window-Software.cpp")
+ target_sources(CSE2 PRIVATE "src/Backends/Window/Null-Software.cpp")
else()
message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination")
endif()
--- a/src/Backends/Controller/SDL2.cpp
+++ b/src/Backends/Controller/SDL2.cpp
@@ -1,5 +1,4 @@
#include "../Controller.h"
-#include "Controller.h"
#include <stddef.h>
@@ -6,6 +5,7 @@
#include "SDL.h"
#include "../Misc.h"
+#include "../Shared/SDL2.h"
#define DEADZONE 10000
--- a/src/Backends/Platform/GLFW3.cpp
+++ b/src/Backends/Platform/GLFW3.cpp
@@ -10,8 +10,8 @@
#include <GLFW/glfw3.h>
-#include "Window.h"
#include "../Rendering.h"
+#include "../Shared/GLFW3.h"
#include "../../Attributes.h"
#include "../../Main.h"
#include "../../Organya.h"
--- a/src/Backends/Platform/SDL2.cpp
+++ b/src/Backends/Platform/SDL2.cpp
@@ -7,9 +7,8 @@
#include "SDL.h"
-#include "Controller.h"
-#include "Window.h"
#include "../Rendering.h"
+#include "../Shared/SDL2.h"
#include "../../Main.h"
#include "../../Organya.h"
#include "../../Profile.h"
--- a/src/Backends/Rendering/SDLSurface.cpp
+++ b/src/Backends/Rendering/SDLSurface.cpp
@@ -8,7 +8,7 @@
#include "SDL.h"
#include "../Misc.h"
-#include "../SDL2/Window.h"
+#include "../Shared/SDL2.h"
typedef struct RenderBackend_Surface
{--- a/src/Backends/Rendering/SDLTexture.cpp
+++ b/src/Backends/Rendering/SDLTexture.cpp
@@ -13,7 +13,7 @@
#include "../../WindowsWrapper.h"
#include "../Misc.h"
-#include "../SDL2/Window.h"
+#include "../Shared/SDL2.h"
#include "../../Draw.h"
#include "../../Ending.h"
#include "../../MapName.h"
--- a/src/Backends/Rendering/WiiU.cpp
+++ b/src/Backends/Rendering/WiiU.cpp
@@ -20,10 +20,10 @@
#include "../Misc.h"
-#include "../WiiU/shaders/colour_fill.gsh.h"
-#include "../WiiU/shaders/glyph.gsh.h"
-#include "../WiiU/shaders/texture.gsh.h"
-#include "../WiiU/shaders/texture_colour_key.gsh.h"
+#include "WiiUShaders/colour_fill.gsh.h"
+#include "WiiUShaders/glyph.gsh.h"
+#include "WiiUShaders/texture.gsh.h"
+#include "WiiUShaders/texture_colour_key.gsh.h"
typedef struct RenderBackend_Surface
{--- a/src/Backends/Window/GLFW3-OpenGL3.cpp
+++ b/src/Backends/Window/GLFW3-OpenGL3.cpp
@@ -1,5 +1,4 @@
#include "../Window-OpenGL.h"
-#include "Window.h"
#include <stddef.h>
#include <stdlib.h>
@@ -12,6 +11,7 @@
#include <GLFW/glfw3.h>
#include "../Misc.h"
+#include "../Shared/GLFW3.h"
GLFWwindow *window;
--- a/src/Backends/Window/GLFW3-Software.cpp
+++ b/src/Backends/Window/GLFW3-Software.cpp
@@ -1,5 +1,4 @@
#include "../Window-Software.h"
-#include "Window.h"
#include <stddef.h>
#include <stdlib.h>
@@ -12,6 +11,7 @@
#include <GLFW/glfw3.h>
#include "../Misc.h"
+#include "../Shared/GLFW3.h"
GLFWwindow *window;
--- a/src/Backends/Window/SDL2-OpenGL3.cpp
+++ b/src/Backends/Window/SDL2-OpenGL3.cpp
@@ -1,5 +1,4 @@
#include "../Window-OpenGL.h"
-#include "Window.h"
#include <stddef.h>
#include <string>
@@ -12,6 +11,7 @@
#include "SDL.h"
#include "../Misc.h"
+#include "../Shared/SDL2.h"
#include "../../Resource.h"
SDL_Window *window;
--- a/src/Backends/Window/SDL2-Software.cpp
+++ b/src/Backends/Window/SDL2-Software.cpp
@@ -1,5 +1,4 @@
#include "../Window-Software.h"
-#include "Window.h"
#include <stddef.h>
#include <stdlib.h>
@@ -8,6 +7,7 @@
#include "SDL.h"
#include "../Misc.h"
+#include "../Shared/SDL2.h"
SDL_Window *window;
--- a/src/Backends/Window/WiiU-Software.cpp
+++ b/src/Backends/Window/WiiU-Software.cpp
@@ -21,7 +21,7 @@
#include "../../Attributes.h"
-#include "shaders/texture.gsh.h"
+#include "WiiUShaders/texture.gsh.h"
typedef struct Viewport
{