|
@@ -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 -Werror -Wextra -pedantic -Wnonportable-include-path -Wshadow -std=c89")
|
|
|
|
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Werror -Wextra -Wnon-virtual-dtor -pedantic -Wnonportable-include-path -Wshadow -std=c++11 -fno-exceptions -fno-rtti")
|
|
|
|
|
|
+ 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_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")
|
|
|
|
|
|
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")
|
|
@@ -22,7 +22,7 @@ endif()
|
|
|
|
|
|
if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
|
|
if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
|
|
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|
- set(CMAKE_OSX_ARCHITECTURES x86_64)
|
|
|
|
|
|
+ set(CMAKE_OSX_ARCHITECTURES x86_64;arm64)
|
|
set(ONLY_ACTIVE_ARCH NO)
|
|
set(ONLY_ACTIVE_ARCH NO)
|
|
endif()
|
|
endif()
|
|
add_subdirectory(spine-c)
|
|
add_subdirectory(spine-c)
|
|
@@ -31,5 +31,15 @@ if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
|
|
add_subdirectory(spine-sfml/cpp)
|
|
add_subdirectory(spine-sfml/cpp)
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
+if((${SPINE_SDL}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sdl"))
|
|
|
|
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|
|
|
+ set(CMAKE_OSX_ARCHITECTURES x86_64;arm64)
|
|
|
|
+ set(ONLY_ACTIVE_ARCH NO)
|
|
|
|
+ endif()
|
|
|
|
+ add_subdirectory(spine-c)
|
|
|
|
+ add_subdirectory(spine-cpp)
|
|
|
|
+ add_subdirectory(spine-sdl)
|
|
|
|
+endif()
|
|
|
|
+
|
|
# add_subdirectory(spine-c/spine-c-unit-tests)
|
|
# add_subdirectory(spine-c/spine-c-unit-tests)
|
|
add_subdirectory(spine-cpp/spine-cpp-unit-tests)
|
|
add_subdirectory(spine-cpp/spine-cpp-unit-tests)
|