duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix stuff

Browse source 
Looks like the Null backend's been broken for a while though
This commit is contained in:
Clownacy 2020-05-06 23:10:40 +01:00
parent e93ee47728
commit 5596c33b38
10 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -375,24 +375,24 @@ elseif(BACKEND_PLATFORM MATCHES "Null")
endif() endif()
if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3") 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") 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 "SDLTexture")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLSurface") elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLSurface")
elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "Software") 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") 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") 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") 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 "WiiU")
elseif(BACKEND_PLATFORM MATCHES "WiiU" AND BACKEND_RENDERER MATCHES "Software") 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") 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() else()
message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination") message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination")
endif() endif()

2
src/Backends/Rendering/OpenGL3.cpp
View file

@ -18,7 +18,7 @@
#include "../../WindowsWrapper.h" #include "../../WindowsWrapper.h"
#include "../Misc.h" #include "../Misc.h"
#include "../Window-OpenGL.h" #include "Window/OpenGL.h"
#include "../../Resource.h" #include "../../Resource.h"
#define TOTAL_VBOS 8 #define TOTAL_VBOS 8

2
src/Backends/Rendering/Software.cpp
View file

@ -5,7 +5,7 @@
#include <string.h> #include <string.h>
#include "../Misc.h" #include "../Misc.h"
#include "../Window-Software.h" #include "Window/Software.h"
#include "../../Attributes.h" #include "../../Attributes.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))

6
src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
View file

@ -1,4 +1,4 @@
#include "../Window-OpenGL.h" #include "../OpenGL.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -10,8 +10,8 @@
#endif #endif
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "../Misc.h" #include "../../../Misc.h"
#include "../Shared/GLFW3.h" #include "../../../Shared/GLFW3.h"
GLFWwindow *window; GLFWwindow *window;

7
src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
View file

@ -1,4 +1,4 @@
#include "../Window-OpenGL.h" #include "../OpenGL.h"
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
@ -10,9 +10,8 @@
#endif #endif
#include "SDL.h" #include "SDL.h"
#include "../Misc.h" #include "../../../Misc.h"
#include "../Shared/SDL2.h" #include "../../../Shared/SDL2.h"
#include "../../Resource.h"
SDL_Window *window; SDL_Window *window;

2
src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
View file

@ -1,2 +1,2 @@
#define USE_OPENGLES2 #define USE_OPENGLES2
#include "Window-OpenGL3.cpp" #include "../OpenGL3/GLFW3.cpp"

2
src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
View file

@ -1,2 +1,2 @@
#define USE_OPENGLES2 #define USE_OPENGLES2
#include "Window-OpenGL3.cpp" #include "../OpenGL3/SDL2.cpp"

6
src/Backends/Rendering/Window/Software/GLFW3.cpp
View file

@ -1,4 +1,4 @@
#include "../Window-Software.h" #include "../Software.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -10,8 +10,8 @@
#endif #endif
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "../Misc.h" #include "../../../Misc.h"
#include "../Shared/GLFW3.h" #include "../../../Shared/GLFW3.h"
GLFWwindow *window; GLFWwindow *window;

2
src/Backends/Rendering/Window/Software/Null.cpp
View file

@ -1,4 +1,4 @@
#include "../Window-Software.h" #include "../Software.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>

6
src/Backends/Rendering/Window/Software/SDL2.cpp
View file

@ -1,4 +1,4 @@
#include "../Window-Software.h" #include "../Software.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -6,8 +6,8 @@
#include "SDL.h" #include "SDL.h"
#include "../Misc.h" #include "../../../Misc.h"
#include "../Shared/SDL2.h" #include "../../../Shared/SDL2.h"
SDL_Window *window; SDL_Window *window;