AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-24 21:38:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

properly install bundled soundfont on Linux (#442)

Browse Source
This commit is contained in:
Fabian Greffrath 2022-02-07 09:31:52 +01:00 committed by GitHub
parent 448871a3e0
commit abcc96c905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -142,10 +142,8 @@ if(NOT SDL2_NET_DIR)
endif()
find_package(SDL2_net)
# FluidSynth backend
find_package(FluidSynth)
if(FluidSynth_FOUND)
install(DIRECTORY soundfonts/ DESTINATION soundfonts)
endif()
# Python 3.
#
@ -165,6 +163,9 @@ if(WIN32)
install(FILES betalevl.wad DESTINATION .)
install(FILES watermap.wad DESTINATION .)
install(DIRECTORY autoload/ DESTINATION autoload)
if(FluidSynth_FOUND)
install(DIRECTORY soundfonts/ DESTINATION soundfonts)
endif()
else()
install(FILES COPYING DESTINATION "share/doc/${PROJECT_TARNAME}")
install(FILES README.md DESTINATION "share/doc/${PROJECT_TARNAME}")
@ -172,6 +173,9 @@ else()
install(FILES betalevl.wad DESTINATION "share/${PROJECT_TARNAME}")
install(FILES watermap.wad DESTINATION "share/${PROJECT_TARNAME}")
install(DIRECTORY autoload/ DESTINATION "share/${PROJECT_TARNAME}/autoload")
if(FluidSynth_FOUND)
install(DIRECTORY soundfonts/ DESTINATION "share/${PROJECT_TARNAME}/soundfonts")
endif()
endif()
# Generate distribution packages with CPack.

6
Source/m_misc.c
View File

@ -2041,10 +2041,10 @@ default_t defaults[] = {
{
"soundfont_path",
(config_t *) &soundfont_path, NULL,
#ifdef _WIN32
{SFINIT(.s, "soundfonts"DIR_SEPARATOR_S"TimGM6mb.sf2")},
#ifdef WOOFDATADIR
{SFINIT(.s, WOOFDATADIR""DIR_SEPARATOR_S"soundfonts"DIR_SEPARATOR_S"TimGM6mb.sf2")},
#else
{SFINIT(.s, "/usr/share/sounds/sf3/default-GM.sf3")},
{SFINIT(.s, "soundfonts"DIR_SEPARATOR_S"TimGM6mb.sf2")},
#endif
{0}, string, ss_none, wad_no,
"FluidSynth soundfont path"