UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[sdl] Fix up CMake, compilation on Linux.

Browse Source
This commit is contained in:
badlogic 2022-08-06 14:09:40 +02:00
parent e2b980c879
commit 92ebbbfc48
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -11,8 +11,8 @@ if(MSVC)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
else() else()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Wextra -pedantic -Wnonportable-include-path -Wshadow -std=c89") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-variadic-macros -Wextra -pedantic -Wshadow -std=c89")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Wextra -Wnon-virtual-dtor -pedantic -Wnonportable-include-path -Wshadow -std=c++11 -fno-exceptions -fno-rtti") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-variadic-macros -Wextra -Wnon-virtual-dtor -pedantic -Wshadow -std=c++11 -fno-exceptions -fno-rtti")
if (${SPINE_SANITIZE}) if (${SPINE_SANITIZE})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")

1
spine-sdl/src/spine-sdl-c.c
View File

@ -30,7 +30,6 @@
#include "spine-sdl-c.h" #include "spine-sdl-c.h"
#include <spine/spine.h> #include <spine/spine.h>
#include <spine/extension.h> #include <spine/extension.h>
#include <SDL.h>
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION

5
spine-sdl/src/spine-sdl-c.h
View File

@ -32,13 +32,12 @@
#include <spine/spine.h> #include <spine/spine.h>
#include <SDL.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct SDL_Renderer;
struct SDL_Texture;
struct SDL_Vertex;
_SP_ARRAY_DECLARE_TYPE(spSdlVertexArray, struct SDL_Vertex) _SP_ARRAY_DECLARE_TYPE(spSdlVertexArray, struct SDL_Vertex)
typedef struct spSkeletonDrawable { typedef struct spSkeletonDrawable {

4
spine-sdl/src/spine-sdl-cpp.h
View File

@ -31,9 +31,7 @@
#define SPINE_SDL #define SPINE_SDL
#include <spine/spine.h> #include <spine/spine.h>
#include <SDL.h>
struct SDL_Renderer;
struct SDL_Vertex;
namespace spine { namespace spine {
class SkeletonDrawable { class SkeletonDrawable {