summaryrefslogtreecommitdiff
path: root/muse2/synti
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/synti')
-rw-r--r--muse2/synti/fluid/CMakeLists.txt8
-rw-r--r--muse2/synti/fluidsynth/CMakeLists.txt18
-rw-r--r--muse2/synti/vam/vam.cpp1
3 files changed, 13 insertions, 14 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}
)
##
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index db96341f..0e9f90bb 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -54,7 +54,9 @@ file (GLOB fluidsynth_source_files
##
## Define target
##
-add_library ( fluidsynth SHARED
+# 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}
${fluidsynth_uis}
@@ -78,30 +80,28 @@ set (FILES_TO_TRANSLATE
# libfluidsynth.so
# - use precompiled header files
#
-set_target_properties ( fluidsynth
+set_target_properties ( fluid_synth
PROPERTIES PREFIX ""
COMPILE_FLAGS "-fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
- LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth"
+ # LINK_FLAGS "${FLUIDSYN_LDFLAGS}" # "-lfluidsynth"
)
-
##
## Linkage
##
-target_link_libraries(fluidsynth
+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.
- # ${FLUIDSYN_LIBRARIES}
- # Try giving full path: Nope, path is empty!
- #${FLUIDSYN_LIBRARY_DIRS}/${FLUIDSYN_LIBRARIES}
+ # Fixed Nov 1, 2011
+ ${FLUIDSYN_LIBRARIES}
)
##
## Install location
##
-install( TARGETS fluidsynth
+install( TARGETS fluid_synth
DESTINATION ${MusE_SYNTHI_DIR}
)
install( FILES README.txt TODO
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index 7928aec2..713d8a59 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -26,7 +26,6 @@
// 02111-1301, USA or point your web browser to http://www.gnu.org.
//=========================================================
-#include <assert.h>
#include <cmath>
#include <stdio.h>
#include <list>