From 980555bc89db3caa97d25905f6769804b77b5a96 Mon Sep 17 00:00:00 2001 From: Nick Graham Date: Tue, 21 Feb 2023 07:49:22 -0330 Subject: [PATCH] Install OpenMusic by default in Linux (#19247) * Add OpenMusic and OpenSoundEffects install options to CMakeLists * Fix #19160: Import OpenMusic by default on Linux Required to open park files using music found in OpenMusic repository --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3202b0e10c..1855b99c82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +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) 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 @@ -158,6 +160,11 @@ if (MACOS_USE_DEPENDENCIES) endif () endif () +# If OS is Linux, import OpenSoundEffects and OpenMusic +if(UNIX AND NOT APPLE) + set(DOWNLOAD_OPENMSX 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 "")