diff options
| author | Florian Jung <flo@windfisch.org> | 2011-11-07 21:43:20 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-11-07 21:43:20 +0000 |
| commit | 720a43f55f893c1472be0f859d224401f1ec73be (patch) | |
| tree | d1876120c5e8892e0c8b2b8d023169f1013d2b11 /muse2/synti/fluid | |
| parent | bce73374a78f5fdcc7cc776395157564b5ef9be5 (diff) | |
housekeeping: pulled fixes from release into trunk
Diffstat (limited to 'muse2/synti/fluid')
| -rw-r--r-- | muse2/synti/fluid/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt index 5be44593..8109493b 100644 --- a/muse2/synti/fluid/CMakeLists.txt +++ b/muse2/synti/fluid/CMakeLists.txt @@ -73,7 +73,7 @@ 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" + # LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth" ) ## @@ -85,9 +85,9 @@ target_link_libraries(fluid # 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. - # ${FLUIDSYN_LIBRARIES} - # Try giving full path: Nope, path is empty! - # ${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES} + # 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} ) ## |