shithub: cstory

Download patch

ref: 5596c33b38938c404e339d4a3c3e04762ed4326a
parent: e93ee47728f4cfb7888ecf4fd8634d18bc27222b
author: Clownacy <Clownacy@users.noreply.github.com>
date: Wed May 6 19:10:40 EDT 2020 

Fix stuff

Looks like the Null backend's been broken for a while though


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,24 +375,24 @@
 endif()
 
 if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGL3/SDL2.cpp")
 elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGLES2")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGLES2.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGLES2/SDL2.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/Window/SDL2-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/SDL2.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGL3")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGLES2")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGLES2.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/GLFW3.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/Window/WiiU-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/WiiU.cpp")
 elseif(BACKEND_PLATFORM MATCHES "Null" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/Null-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/Null.cpp")
 else()
 	message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination")
 endif()
--- a/src/Backends/Rendering/OpenGL3.cpp
+++ b/src/Backends/Rendering/OpenGL3.cpp
@@ -18,7 +18,7 @@
 #include "../../WindowsWrapper.h"
 
 #include "../Misc.h"
-#include "../Window-OpenGL.h"
+#include "Window/OpenGL.h"
 #include "../../Resource.h"
 
 #define TOTAL_VBOS 8
--- a/src/Backends/Rendering/Software.cpp
+++ b/src/Backends/Rendering/Software.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "../Misc.h"
-#include "../Window-Software.h"
+#include "Window/Software.h"
 #include "../../Attributes.h"
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
--- a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
@@ -1,4 +1,4 @@
-#include "../Window-OpenGL.h"
+#include "../OpenGL.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -10,8 +10,8 @@
 #endif
 #include <GLFW/glfw3.h>
 
-#include "../Misc.h"
-#include "../Shared/GLFW3.h"
+#include "../../../Misc.h"
+#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 
--- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
@@ -1,4 +1,4 @@
-#include "../Window-OpenGL.h"
+#include "../OpenGL.h"
 
 #include <stddef.h>
 #include <string>
@@ -10,9 +10,8 @@
 #endif
 #include "SDL.h"
 
-#include "../Misc.h"
-#include "../Shared/SDL2.h"
-#include "../../Resource.h"
+#include "../../../Misc.h"
+#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;
 
--- a/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
@@ -1,2 +1,2 @@
 #define USE_OPENGLES2
-#include "Window-OpenGL3.cpp"
+#include "../OpenGL3/GLFW3.cpp"
--- a/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
+++ b/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
@@ -1,2 +1,2 @@
 #define USE_OPENGLES2
-#include "Window-OpenGL3.cpp"
+#include "../OpenGL3/SDL2.cpp"
--- a/src/Backends/Rendering/Window/Software/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/Software/GLFW3.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -10,8 +10,8 @@
 #endif
 #include <GLFW/glfw3.h>
 
-#include "../Misc.h"
-#include "../Shared/GLFW3.h"
+#include "../../../Misc.h"
+#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 
--- a/src/Backends/Rendering/Window/Software/Null.cpp
+++ b/src/Backends/Rendering/Window/Software/Null.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
--- a/src/Backends/Rendering/Window/Software/SDL2.cpp
+++ b/src/Backends/Rendering/Window/Software/SDL2.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -6,8 +6,8 @@
 
 #include "SDL.h"
 
-#include "../Misc.h"
-#include "../Shared/SDL2.h"
+#include "../../../Misc.h"
+#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;