diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-14 15:08:02 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-14 15:08:02 +0000 |
| commit | c36a5508aa42e596b005425208054af9a60734b4 (patch) | |
| tree | fde0504e0c25b8f39ed6f5f7f7332943e4a95c7f /muse2/synti/fluid | |
| parent | 42126f3b398802eb24c8d9acd2591ef4dbe7257d (diff) | |
pulled fixes from release into trunk
Diffstat (limited to 'muse2/synti/fluid')
| -rw-r--r-- | muse2/synti/fluid/CMakeLists.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt index 8109493b..3789a745 100644 --- a/muse2/synti/fluid/CMakeLists.txt +++ b/muse2/synti/fluid/CMakeLists.txt @@ -73,7 +73,6 @@ set (FILES_TO_TRANSLATE set_target_properties ( fluid PROPERTIES PREFIX "" COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h" - # LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth" ) ## @@ -82,11 +81,6 @@ set_target_properties ( fluid target_link_libraries(fluid synti ${QT_LIBRARIES} - # Can't do this. FLUIDSYN_LIBRARIES = fluidsynth, which is the name - # of our fluidsynth.so shared synthesizer library. - # This caused ../fluidsynth/fluidsynth.so to appear in the link line. - # Nov 1, 2011. fluidsynth module renamed fluid_synth to avoid bizarre new conflict on Ubuntu 11.10, seems due to LINK_FLAGS line. - # Got undefined symbol fluid_synth_cc, in fluid, at startup at runtime. So we can enable this now. ${FLUIDSYN_LIBRARIES} ) |