summaryrefslogtreecommitdiff
path: root/muse2/synti/fluidsynth
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-10-24 08:21:08 +0000
committerTim E. Real <termtech@rogers.com>2010-10-24 08:21:08 +0000
commit30a64aa8da492ada95aff171b745e7b50145f643 (patch)
tree867c8dd3053928f195535244a685825dba1ade93 /muse2/synti/fluidsynth
parent5ffe4bc73bd86027b2ce78ef804609df6dad03e9 (diff)
See ChangeLog
Diffstat (limited to 'muse2/synti/fluidsynth')
-rw-r--r--muse2/synti/fluidsynth/CMakeLists.txt9
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.cpp1
2 files changed, 7 insertions, 3 deletions
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index 1a10ba06..cdb298e2 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library ( fluidsynth SHARED
${fluidsynth_uis}
)
-target_link_libraries( fluidsynth synti )
+# target_link_libraries( fluidsynth synti )
# - tell cmake to name target fluidsynth.so instead of
# libfluidsynth.so
@@ -39,13 +39,16 @@ target_link_libraries( fluidsynth synti )
set_target_properties ( fluidsynth
PROPERTIES PREFIX ""
COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
- LINK_FLAGS "${FLUID_LIBRARIES}"
+ LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth"
)
target_link_libraries(fluidsynth
synti
${QT_LIBRARIES}
- ${FLUID_LIBRARIES}
+ # Can't do this here, since FLUIDSYN_LIBRARIES evaluates to 'fluidsynth', the same name as our target.
+ # ${FLUIDSYN_LIBRARIES}
+ # Try giving full path: Nope, path is empty!
+ #${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES}
)
install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index d3cd5699..bf27a61c 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -516,6 +516,7 @@ bool FluidSynth::sysex(int n, const unsigned char* d)
void FluidSynth::sendSysex(int l, const unsigned char* d)
{
MidiPlayEvent ev(0, 0, ME_SYSEX, d, l);
+ //printf("FluidSynth::sendSysex gui:%p\n", gui);
gui->writeEvent(ev);
}