From db27954e4d480c7917ba4738966b21b7b620ca64 Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Thu, 18 May 2006 14:18:04 +0000 Subject: fix synti builds --- muse/CMakeLists.txt | 4 +- muse/share/templates/synti.med | 987 ++++++++++------------------------- muse/synti/CMakeLists.txt | 8 +- muse/synti/deicsonze/CMakeLists.txt | 1 + muse/synti/fluid/CMakeLists.txt | 3 + muse/synti/fluidsynth/CMakeLists.txt | 3 + muse/synti/libsynti/CMakeLists.txt | 1 + muse/synti/organ/CMakeLists.txt | 2 + muse/synti/s1/CMakeLists.txt | 2 + muse/synti/vam/CMakeLists.txt | 2 + 10 files changed, 290 insertions(+), 723 deletions(-) diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 1ea31fd2..a5025368 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -20,7 +20,7 @@ project(muse) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1) -# set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) @@ -37,7 +37,7 @@ include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake ) option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" ON) option ( ENABLE_VST "enable VST/win support" OFF) -option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON) +option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" OFF) # set(CMAKE_VERBOSE_MAKEFILE ON) set(QT_USE_QTXML TRUE) diff --git a/muse/share/templates/synti.med b/muse/share/templates/synti.med index d0dcc6d2..f9a811b5 100644 --- a/muse/share/templates/synti.med +++ b/muse/share/templates/synti.med @@ -1,765 +1,339 @@ - + - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 127 - 127 - 1 - -1 - 1 - 00:00:00:00:00 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 0 - - 0 - 298 296 - -
7 6 5 4 3 2 1 0
- - 0 - 266 - 1 - - - - 2 - 63 - 127 - 63 - 70 - 9 - 0 - 1 - 1 - 4 - 4 - 0 - 0 - 1 - 0 - - 0 - 28 - 31 - 33 - 29 - - organ-1 - organ-1 - 0 - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - - fluid-1 - fluid-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - s1-1 - s1-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - vam-1 - vam-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - - 96 - 96 - 600 - 400 - 50 - 300 - - - 96 - 96 - 80 - 50 - 0 - 0 - 600 - 400 - 0 - - - 0 - - - - 600 - 400 - - + 127 + 127 + 1 + + 00:00:00:00:00 + + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + + + 0 + 0 + - 0 + 12288 0 0 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 18432 - 1 Track 1 - 0 0 - 0 - 0 - 0 - 20 - 0 - 0 - 0 - 65535 - 65535 - 0 + 31 0 0 0 100 100 - 1 Track 1 - - 1 + + 0 0 Out 1 - 0 0 - 0 - 0 2 - 20 - 0 - 1 - 0 - 0 + + + 31 0 - 0 - - - - fluid-1 - 0 0 - 0 1 2 - 20 - 124 - 0 - 0 + 1 + + + 31 0 - 1 - - - - fluid - 1 0 - - - 7c 00 01 2f 68 6f 6d 65 2f 77 73 2f 73 66 6f 6e - 74 2f 46 6c 75 69 64 52 33 2e 53 46 32 00 - - organ-1 - 0 0 - 0 - 0 1 - 20 - 0 - 0 - 0 + 1 + + + 31 0 - 0 - - - - organ - 0 0 - - - 00 00 03 00 ff 3f 00 00 01 00 03 00 ff 3f 00 00 - 02 00 03 00 ff 3f 00 00 03 00 03 00 ff 3f 00 00 - 04 00 03 00 ff 3f 00 00 05 00 03 00 ff 3f 00 00 - 06 00 03 00 a2 00 00 00 07 00 03 00 00 00 00 00 - 08 00 03 00 ff 3f 00 00 09 00 03 00 fe 1f 00 00 - 0a 00 03 00 a2 00 00 00 0b 00 03 00 00 00 00 00 - 0c 00 03 00 ff 3f 00 00 0d 00 03 00 fe 1f 00 00 - 0e 00 03 00 01 00 00 00 0f 00 03 00 01 00 00 00 - 10 00 03 00 01 00 00 00 - - + s1-1 - 0 0 - 0 1 1 - 20 - 11 - 0 - 0 + 1 + + + 31 0 - 1 - - - - s1 - 2 - 0 vam-1 - 0 0 - 0 1 1 - 20 - 0 - 0 - 0 + + + 31 0 - 1 - - - - vam - 3 0 + - 1:Out 1 - alsa_pcm:playback_1 - - - 2:Out 1 - alsa_pcm:playback_2 - - - fluid-1 - Out 1 + fluid-1 + Out 1 - organ-1 - Out 1 + organ-1 + Out 1 - s1-1 - Out 1 + s1-1 + Out 1 - vam-1 - Out 1 + vam-1 + Out 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 0.04 + 1 + 0 + 0 + + 144 + 578 + + 0 @@ -773,34 +347,7 @@ 4 - - - - - - - 0:0 - - - - - 96 - 96 - - 255 - 0 - 0 - 1 - 80 - 50 - 0 - 0 - 0 - 346 - 390 - 286 - diff --git a/muse/synti/CMakeLists.txt b/muse/synti/CMakeLists.txt index 3d02797c..02babaf9 100644 --- a/muse/synti/CMakeLists.txt +++ b/muse/synti/CMakeLists.txt @@ -27,6 +27,12 @@ include_directories( ${PROJECT_SOURCE_DIR}/synti ) -subdirs(libsynti s1 organ fluid deicsonze fluidsynth simpledrums vam ) +set (SubDirs libsynti s1 organ deicsonze simpledrums vam ) + +if (ENABLE_FLUID) + set (SubDirs ${SubDirs} fluid fluidsynth ) +endif (ENABLE_FLUID) + +subdirs(${SubDirs}) diff --git a/muse/synti/deicsonze/CMakeLists.txt b/muse/synti/deicsonze/CMakeLists.txt index f14609d2..6edf37a2 100644 --- a/muse/synti/deicsonze/CMakeLists.txt +++ b/muse/synti/deicsonze/CMakeLists.txt @@ -29,6 +29,7 @@ add_library ( deicsonze SHARED ${deicsonze_mocs} ${deicsonze_uis} ) +target_link_libraries( deicsonze synti ) # - tell cmake to name target deicsonze.so instead of # libdeicsonze.so diff --git a/muse/synti/fluid/CMakeLists.txt b/muse/synti/fluid/CMakeLists.txt index b29015aa..9304564f 100644 --- a/muse/synti/fluid/CMakeLists.txt +++ b/muse/synti/fluid/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( fluid SHARED ${fluid_uis} ) +target_link_libraries( fluid synti ) + # - tell cmake to name target fluid.so instead of # libfluid.so # - use precompiled header files @@ -36,6 +38,7 @@ add_library ( fluid SHARED set_target_properties ( fluid PROPERTIES PREFIX "" COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h" + LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}" ) install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluid ) diff --git a/muse/synti/fluidsynth/CMakeLists.txt b/muse/synti/fluidsynth/CMakeLists.txt index 1b56396f..1dbe477f 100644 --- a/muse/synti/fluidsynth/CMakeLists.txt +++ b/muse/synti/fluidsynth/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( fluidsynth SHARED ${fluidsynth_uis} ) +target_link_libraries( fluidsynth synti ) + # - tell cmake to name target fluidsynth.so instead of # libfluidsynth.so # - use precompiled header files @@ -36,6 +38,7 @@ add_library ( fluidsynth SHARED set_target_properties ( fluidsynth PROPERTIES PREFIX "" COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h" + LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}" ) install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluidsynth ) diff --git a/muse/synti/libsynti/CMakeLists.txt b/muse/synti/libsynti/CMakeLists.txt index 922fe644..b6d98df6 100644 --- a/muse/synti/libsynti/CMakeLists.txt +++ b/muse/synti/libsynti/CMakeLists.txt @@ -19,6 +19,7 @@ #============================================================================= add_library(synti mess.cpp gui.cpp mono.cpp poly.cpp mpevent.cpp) + set_target_properties( synti PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h" ) diff --git a/muse/synti/organ/CMakeLists.txt b/muse/synti/organ/CMakeLists.txt index 26f10066..5be60520 100644 --- a/muse/synti/organ/CMakeLists.txt +++ b/muse/synti/organ/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( organ SHARED ${organ_uis} ) +target_link_libraries( organ synti ) + # - tell cmake to name target organ.so instead of # liborgan.so # - use precompiled header files diff --git a/muse/synti/s1/CMakeLists.txt b/muse/synti/s1/CMakeLists.txt index dfd1f19e..83428204 100644 --- a/muse/synti/s1/CMakeLists.txt +++ b/muse/synti/s1/CMakeLists.txt @@ -20,6 +20,8 @@ add_library ( s1 SHARED s1.cpp ) +target_link_libraries( s1 synti ) + # tell cmake to name target s1.so instead of # libs1.so # diff --git a/muse/synti/vam/CMakeLists.txt b/muse/synti/vam/CMakeLists.txt index 51c1b38a..2965d5d8 100644 --- a/muse/synti/vam/CMakeLists.txt +++ b/muse/synti/vam/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( vam SHARED ${vam_uis} ) +target_link_libraries( vam synti ) + # - tell cmake to name target vam.so instead of # libvam.so # - use precompiled header files -- cgit v1.2.3