summaryrefslogtreecommitdiff
path: root/muse2/synti
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/synti')
-rw-r--r--muse2/synti/fluid/CMakeLists.txt6
-rw-r--r--muse2/synti/fluidsynth/CMakeLists.txt6
2 files changed, 0 insertions, 12 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}
)
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index 0e9f90bb..8ac178be 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -54,8 +54,6 @@ file (GLOB fluidsynth_source_files
##
## Define target
##
-# 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_set_reverb at startup at runtime.
add_library ( fluid_synth SHARED
${fluidsynth_source_files}
${fluidsynth_mocs}
@@ -83,7 +81,6 @@ set (FILES_TO_TRANSLATE
set_target_properties ( fluid_synth
PROPERTIES PREFIX ""
COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
- # LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth"
)
##
@@ -92,9 +89,6 @@ set_target_properties ( fluid_synth
target_link_libraries(fluid_synth
synti
${QT_LIBRARIES}
- # Can't do this here, since FLUIDSYN_LIBRARIES evaluates
- # to 'fluidsynth', the same name as our target.
- # Fixed Nov 1, 2011
${FLUIDSYN_LIBRARIES}
)