Revert "Update Link SFML usage to SFML 3.x APIs"
This reverts commit e82ae7bb13
.
Sorry, somehow I pushed to the wrong branch.
This commit is contained in:
parent
e82ae7bb13
commit
d5ac2a853b
|
@ -71,7 +71,7 @@ find_package(PkgConfig)
|
|||
if(TRANSLATIONS_ONLY)
|
||||
set(ENABLE_LINK_DEFAULT OFF)
|
||||
else()
|
||||
find_package(SFML 3.0 COMPONENTS network system)
|
||||
find_package(SFML 2.4 COMPONENTS network system)
|
||||
set(ENABLE_LINK_DEFAULT OFF)
|
||||
if(SFML_FOUND)
|
||||
set(ENABLE_LINK_DEFAULT ON)
|
||||
|
@ -79,6 +79,11 @@ else()
|
|||
endif()
|
||||
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
|
||||
set(FFMPEG_DEFAULT OFF)
|
||||
set(FFMPEG_COMPONENTS AVCODEC AVFORMAT SWSCALE AVUTIL SWRESAMPLE)
|
||||
|
|
Loading…
Reference in New Issue