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

Fix everything after the last commit

Browse source
This commit is contained in:
Clownacy 2020-05-06 22:52:11 +01:00
parent 616b9cda9e
commit dacd34072a
12 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
CMakeLists.txt
View file

@ -352,48 +352,47 @@ endif()
if(BACKEND_PLATFORM MATCHES "SDL2") if(BACKEND_PLATFORM MATCHES "SDL2")
target_sources(CSE2 PRIVATE target_sources(CSE2 PRIVATE
"src/Backends/SDL2/Controller.cpp" "src/Backends/Controller/SDL2.cpp"
"src/Backends/SDL2/Controller.h" "src/Backends/Platform/SDL2.cpp"
"src/Backends/SDL2/Misc.cpp" "src/Backends/Shared/SDL2.h"
"src/Backends/SDL2/Window.h"
) )
elseif(BACKEND_PLATFORM MATCHES "GLFW3") elseif(BACKEND_PLATFORM MATCHES "GLFW3")
target_sources(CSE2 PRIVATE target_sources(CSE2 PRIVATE
"src/Backends/GLFW3/Controller.cpp" "src/Backends/Controller/GLFW3.cpp"
"src/Backends/GLFW3/Misc.cpp" "src/Backends/Platform/GLFW3.cpp"
"src/Backends/GLFW3/Window.h" "src/Backends/Shared/GLFW3.h"
) )
elseif(BACKEND_PLATFORM MATCHES "WiiU") elseif(BACKEND_PLATFORM MATCHES "WiiU")
target_sources(CSE2 PRIVATE target_sources(CSE2 PRIVATE
"src/Backends/WiiU/Controller.cpp" "src/Backends/Controller/WiiU.cpp"
"src/Backends/WiiU/Misc.cpp" "src/Backends/Platform/WiiU.cpp"
) )
elseif(BACKEND_PLATFORM MATCHES "Null") elseif(BACKEND_PLATFORM MATCHES "Null")
target_sources(CSE2 PRIVATE target_sources(CSE2 PRIVATE
"src/Backends/Null/Controller.cpp" "src/Backends/Controller/Null.cpp"
"src/Backends/Null/Misc.cpp" "src/Backends/Platform/Null.cpp"
) )
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/SDL2/Window-OpenGL3.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.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/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 "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/SDL2/Window-Software.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-Software.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/GLFW3/Window-OpenGL3.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.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/GLFW3/Window-OpenGLES2.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGLES2.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/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 "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/WiiU/Window-Software.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/WiiU-Software.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/Null/Window-Software.cpp") target_sources(CSE2 PRIVATE "src/Backends/Window/Null-Software.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/Controller/SDL2.cpp
View file

@ -1,11 +1,11 @@
#include "../Controller.h" #include "../Controller.h"
#include "Controller.h"
#include <stddef.h> #include <stddef.h>
#include "SDL.h" #include "SDL.h"
#include "../Misc.h" #include "../Misc.h"
#include "../Shared/SDL2.h"
#define DEADZONE 10000 #define DEADZONE 10000

2
src/Backends/Platform/GLFW3.cpp
View file

@ -10,8 +10,8 @@
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "Window.h"
#include "../Rendering.h" #include "../Rendering.h"
#include "../Shared/GLFW3.h"
#include "../../Attributes.h" #include "../../Attributes.h"
#include "../../Main.h" #include "../../Main.h"
#include "../../Organya.h" #include "../../Organya.h"

3
src/Backends/Platform/SDL2.cpp
View file

@ -7,9 +7,8 @@
#include "SDL.h" #include "SDL.h"
#include "Controller.h"
#include "Window.h"
#include "../Rendering.h" #include "../Rendering.h"
#include "../Shared/SDL2.h"
#include "../../Main.h" #include "../../Main.h"
#include "../../Organya.h" #include "../../Organya.h"
#include "../../Profile.h" #include "../../Profile.h"

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

@ -8,7 +8,7 @@
#include "SDL.h" #include "SDL.h"
#include "../Misc.h" #include "../Misc.h"
#include "../SDL2/Window.h" #include "../Shared/SDL2.h"
typedef struct RenderBackend_Surface typedef struct RenderBackend_Surface
{ {

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

@ -13,7 +13,7 @@
#include "../../WindowsWrapper.h" #include "../../WindowsWrapper.h"
#include "../Misc.h" #include "../Misc.h"
#include "../SDL2/Window.h" #include "../Shared/SDL2.h"
#include "../../Draw.h" #include "../../Draw.h"
#include "../../Ending.h" #include "../../Ending.h"
#include "../../MapName.h" #include "../../MapName.h"

8
src/Backends/Rendering/WiiU.cpp
View file

@ -20,10 +20,10 @@
#include "../Misc.h" #include "../Misc.h"
#include "../WiiU/shaders/colour_fill.gsh.h" #include "WiiUShaders/colour_fill.gsh.h"
#include "../WiiU/shaders/glyph.gsh.h" #include "WiiUShaders/glyph.gsh.h"
#include "../WiiU/shaders/texture.gsh.h" #include "WiiUShaders/texture.gsh.h"
#include "../WiiU/shaders/texture_colour_key.gsh.h" #include "WiiUShaders/texture_colour_key.gsh.h"
typedef struct RenderBackend_Surface typedef struct RenderBackend_Surface
{ {

2
src/Backends/Window/GLFW3-OpenGL3.cpp
View file

@ -1,5 +1,4 @@
#include "../Window-OpenGL.h" #include "../Window-OpenGL.h"
#include "Window.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -12,6 +11,7 @@
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "../Misc.h" #include "../Misc.h"
#include "../Shared/GLFW3.h"
GLFWwindow *window; GLFWwindow *window;

2
src/Backends/Window/GLFW3-Software.cpp
View file

@ -1,5 +1,4 @@
#include "../Window-Software.h" #include "../Window-Software.h"
#include "Window.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -12,6 +11,7 @@
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "../Misc.h" #include "../Misc.h"
#include "../Shared/GLFW3.h"
GLFWwindow *window; GLFWwindow *window;

2
src/Backends/Window/SDL2-OpenGL3.cpp
View file

@ -1,5 +1,4 @@
#include "../Window-OpenGL.h" #include "../Window-OpenGL.h"
#include "Window.h"
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
@ -12,6 +11,7 @@
#include "SDL.h" #include "SDL.h"
#include "../Misc.h" #include "../Misc.h"
#include "../Shared/SDL2.h"
#include "../../Resource.h" #include "../../Resource.h"
SDL_Window *window; SDL_Window *window;

2
src/Backends/Window/SDL2-Software.cpp
View file

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

2
src/Backends/Window/WiiU-Software.cpp
View file

@ -21,7 +21,7 @@
#include "../../Attributes.h" #include "../../Attributes.h"
#include "shaders/texture.gsh.h" #include "WiiUShaders/texture.gsh.h"
typedef struct Viewport typedef struct Viewport
{ {