mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMakeLists.txt: Do not force download of OpenMSX/OpenSFX 

This change removes the hardcoded enable for Linuxsystems, where
DOWNLOAD_OPENMSX and DOWNLOAD_OPENSFX is always set to ON and as a
result overwriting users choice not to download those files.

Also setting DOWNLOAD_OPENMSX and DOWNLOAD_OPENSFX to ON, in order not
to break existing behauvior.

This fixes https://github.com/OpenRCT2/OpenRCT2/issues/19763
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Conrad Kostecki 2023-04-01 22:08:28 +02:00 committed by Conrad Kostecki
parent ad0229199d
commit d4a803e89e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -86,8 +86,8 @@ option(PORTABLE "Create a portable build (-rpath=$ORIGIN)" OFF)
option(APPIMAGE "Create an appimage build (-rpath=$ORIGIN/../lib)" OFF)
option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
option(DOWNLOAD_OBJECTS "Download objects during installation." ON)
option(DOWNLOAD_OPENSFX "Download OpenSoundEffects during installation." OFF)
option(DOWNLOAD_OPENMSX "Download OpenMusic during installation." OFF)
option(DOWNLOAD_OPENSFX "Download OpenSoundEffects during installation." ON)
option(DOWNLOAD_OPENMSX "Download OpenMusic during installation." ON)
CMAKE_DEPENDENT_OPTION(DOWNLOAD_REPLAYS "Download replays during installation." ON
"WITH_TESTS" OFF)
CMAKE_DEPENDENT_OPTION(MACOS_USE_DEPENDENCIES "Use OpenRCT2 dependencies instead of system libraries" ON
@ -160,12 +160,6 @@ if (MACOS_USE_DEPENDENCIES)
endif ()
endif ()
# If OS is Linux, import OpenSoundEffects and OpenMusic
if(UNIX AND NOT APPLE)
set(DOWNLOAD_OPENMSX ON)
set(DOWNLOAD_OPENSFX ON)
endif()
# LIST of supported flags, use SET_CHECK_CXX_FLAGS() to apply to target.
# Use ADD_CHECK_CXX_COMPILER_FLAG() to add to list.
set(SUPPORTED_CHECK_CXX_COMPILER_FLAGS "")