From 30a64aa8da492ada95aff171b745e7b50145f643 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Sun, 24 Oct 2010 08:21:08 +0000
Subject: See ChangeLog

---
 muse2/synti/deicsonze/CMakeLists.txt  |  2 +-
 muse2/synti/fluid/CMakeLists.txt      | 10 +++++++---
 muse2/synti/fluidsynth/CMakeLists.txt |  9 ++++++---
 muse2/synti/fluidsynth/fluidsynti.cpp |  1 +
 muse2/synti/s1/CMakeLists.txt         |  2 +-
 muse2/synti/vam/CMakeLists.txt        |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'muse2/synti')

diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
index e705e0ae..a39b0e14 100644
--- a/muse2/synti/deicsonze/CMakeLists.txt
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -38,7 +38,7 @@ add_library ( deicsonze SHARED
       ${deicsonze_uis}
       )
 
-target_link_libraries( deicsonze synti )
+# target_link_libraries( deicsonze synti )
 
 # - tell cmake to name target deicsonze.so instead of
 #   libdeicsonze.so
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt
index 82bc6e5f..4d7506d2 100644
--- a/muse2/synti/fluid/CMakeLists.txt
+++ b/muse2/synti/fluid/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library ( fluid SHARED
       ${fluid_uis}
       )
 
-target_link_libraries( fluid synti )
+# target_link_libraries( fluid synti )
 
 # - tell cmake to name target fluid.so instead of 
 #   libfluid.so
@@ -39,12 +39,16 @@ target_link_libraries( fluid synti )
 set_target_properties ( fluid
    PROPERTIES PREFIX ""
    COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
-   LINK_FLAGS "${FLUID_LIBRARIES}"
+   LINK_FLAGS "-l${FLUIDSYN_LIBRARIES}"
    )
 target_link_libraries(fluid
       synti
       ${QT_LIBRARIES}
-      ${FLUID_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.
+      # ${FLUIDSYN_LIBRARIES}
+      # Try giving full path: Nope, path is empty!
+      # ${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES}
       )
 
 install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluid )
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);
       }
 
diff --git a/muse2/synti/s1/CMakeLists.txt b/muse2/synti/s1/CMakeLists.txt
index fe5a3393..890c6b12 100644
--- a/muse2/synti/s1/CMakeLists.txt
+++ b/muse2/synti/s1/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 add_library ( s1 SHARED s1.cpp )
 
-target_link_libraries( s1 synti )
+# target_link_libraries( s1 synti )
 
 # tell cmake to name target s1.so instead of 
 # libs1.so
diff --git a/muse2/synti/vam/CMakeLists.txt b/muse2/synti/vam/CMakeLists.txt
index f707dc43..b93a5c9d 100644
--- a/muse2/synti/vam/CMakeLists.txt
+++ b/muse2/synti/vam/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library ( vam SHARED
       ${vam_uis}
       )
 
-target_link_libraries( vam synti )
+# target_link_libraries( vam synti )
 
 # - tell cmake to name target vam.so instead of 
 #   libvam.so
-- 
cgit v1.2.3