Update Link SFML usage to SFML 3.x APIs
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
parent
20b82d8ab7
commit
e82ae7bb13
|
@ -71,7 +71,7 @@ find_package(PkgConfig)
|
||||||
if(TRANSLATIONS_ONLY)
|
if(TRANSLATIONS_ONLY)
|
||||||
set(ENABLE_LINK_DEFAULT OFF)
|
set(ENABLE_LINK_DEFAULT OFF)
|
||||||
else()
|
else()
|
||||||
find_package(SFML 2.4 COMPONENTS network system)
|
find_package(SFML 3.0 COMPONENTS network system)
|
||||||
set(ENABLE_LINK_DEFAULT OFF)
|
set(ENABLE_LINK_DEFAULT OFF)
|
||||||
if(SFML_FOUND)
|
if(SFML_FOUND)
|
||||||
set(ENABLE_LINK_DEFAULT ON)
|
set(ENABLE_LINK_DEFAULT ON)
|
||||||
|
@ -79,11 +79,6 @@ else()
|
||||||
endif()
|
endif()
|
||||||
option(ENABLE_LINK "Enable GBA linking functionality (BROKEN)" ${ENABLE_LINK_DEFAULT})
|
option(ENABLE_LINK "Enable GBA linking functionality (BROKEN)" ${ENABLE_LINK_DEFAULT})
|
||||||
|
|
||||||
if(ENABLE_LINK)
|
|
||||||
# Always disable link for now as SFML 2 is broken and we don't have a replacement yet.
|
|
||||||
set(ENABLE_LINK OFF CACHE BOOL "Enable GBA linking functionality (BROKEN)" FORCE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# FFMpeg
|
# FFMpeg
|
||||||
set(FFMPEG_DEFAULT OFF)
|
set(FFMPEG_DEFAULT OFF)
|
||||||
set(FFMPEG_COMPONENTS AVCODEC AVFORMAT SWSCALE AVUTIL SWRESAMPLE)
|
set(FFMPEG_COMPONENTS AVCODEC AVFORMAT SWSCALE AVUTIL SWRESAMPLE)
|
||||||
|
|
Loading…
Reference in New Issue