Fix stuff
Looks like the Null backend's been broken for a while though
This commit is contained in:
Clownacy
parent
e93ee47728
commit
5596c33b38
10 changed files with 25 additions and 26 deletions
|
|
@ -375,24 +375,24 @@ elseif(BACKEND_PLATFORM MATCHES "Null")
|
|||
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()
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
#define USE_OPENGLES2
|
||||
#include "Window-OpenGL3.cpp"
|
||||
#include "../OpenGL3/GLFW3.cpp"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
#define USE_OPENGLES2
|
||||
#include "Window-OpenGL3.cpp"
|
||||
#include "../OpenGL3/SDL2.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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../Window-Software.h"
|
||||
#include "../Software.h"
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue