thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building errors with webm, catch missing SRB2_CONFIG_ENABLE_WEBM_MOVIES condition

Browse source
This commit is contained in:
SteelT 2023-02-28 21:49:24 -05:00
parent 639a56bdfd
commit de00dd15fc
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -133,10 +133,12 @@ if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
find_package(SDL2 REQUIRED)
find_package(CURL REQUIRED)
find_package(GME REQUIRED)
if (SRB2_CONFIG_ENABLE_WEBM_MOVIES)
find_package(VPX REQUIRED)
find_package(Vorbis REQUIRED)
find_package(VorbisEnc REQUIRED)
endif()
endif()
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")

4
thirdparty/CMakeLists.txt vendored
View file

@ -24,10 +24,12 @@ include("cpm-fmt.cmake")
include("cpm-imgui.cmake")
include("cpm-acsvm.cmake")
if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND SRB2_CONFIG_ENABLE_WEBM_MOVIES)
if (SRB2_CONFIG_ENABLE_WEBM_MOVIES)
if (NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
include("cpm-libvpx.cmake")
include("cpm-ogg.cmake") # libvorbis depends
include("cpm-libvorbis.cmake")
endif()
include("cpm-libwebm.cmake")
include("cpm-libyuv.cmake")
endif()