ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build for Haiku and a handful of other oses with the spirv-tools dependency.

Browse Source
This commit is contained in:
David Carlier 2022-03-26 15:05:08 +00:00
parent bed91e67a0
commit 37a57d0011
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -722,6 +722,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(supertuxkart nsl socket vorbisfile) target_link_libraries(supertuxkart nsl socket vorbisfile)
endif() endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
target_link_libraries(supertuxkart vorbisfile)
endif()
if (USE_DNS_C) if (USE_DNS_C)
target_link_libraries(supertuxkart dnsc) target_link_libraries(supertuxkart dnsc)
else() else()

6
lib/shaderc/third_party/spirv-tools/CMakeLists.txt vendored
View File

@ -59,8 +59,14 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS}) set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
add_definitions(-DSPIRV_FREEBSD) add_definitions(-DSPIRV_FREEBSD)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
add_definitions(-DSPIRV_OPENBSD)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "NetBSD")
add_definitions(-DSPIRV_NETBSD)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
add_definitions(-DSPIRV_FUCHSIA) add_definitions(-DSPIRV_FUCHSIA)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Haiku")
add_definitions(-DSPIRV_HAIKU)
else() else()
message(FATAL_ERROR "Your platform '${CMAKE_SYSTEM_NAME}' is not supported!") message(FATAL_ERROR "Your platform '${CMAKE_SYSTEM_NAME}' is not supported!")
endif() endif()

2
src/utils/mem_utils.hpp
View File

@ -24,7 +24,7 @@ namespace MemUtils {
callback cb; callback cb;
bool chg; bool chg;
public: public:
deref(callback _c) : cb(std::move(_c)) {} deref(callback _c) : cb(std::move(_c)), chg(true) {}
deref(const deref &) = delete; deref(const deref &) = delete;
deref& operator=(const deref &) = delete; deref& operator=(const deref &) = delete;
deref(deref &&other) : deref(deref &&other) :