[SCM] calf/master: Likewise, fftw -> sfftw.
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:41:06 UTC 2013
The following commit has been merged in the master branch:
commit 7f086659e5fc4dd2aec49dc0677d4353b696afd3
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Sat Aug 25 15:53:17 2012 +0100
Likewise, fftw -> sfftw.
diff --git a/src/Makefile.am b/src/Makefile.am
index cdc27c7..bd8a19a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
noinst_LTLIBRARIES += libcalfgui.la
bin_PROGRAMS += calfjackhost
calfjackhost_SOURCES = gtk_session_env.cpp host_session.cpp jack_client.cpp jackhost.cpp gtk_main_win.cpp session_mgr.cpp
-calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(GLIB_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
+calfjackhost_LDADD = libcalfgui.la calf.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS) $(GLIB_DEPS_LIBS) $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lsfftw
if USE_LASH
AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
calfjackhost_LDADD += $(LASH_DEPS_LIBS)
@@ -40,9 +40,9 @@ calfbenchmark_LDADD = $(GLIB_DEPS_LIBS) -lsrfftw calf.la
calf_la_SOURCES = audio_fx.cpp metadata.cpp modules.cpp modules_comp.cpp modules_limit.cpp modules_dist.cpp modules_eq.cpp modules_mod.cpp fluidsynth.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp plugin.cpp preset.cpp synth.cpp utils.cpp wavetable.cpp modmatrix.cpp
calf_la_LIBADD ?= $(FLUIDSYNTH_DEPS_LIBS)
if USE_DEBUG
-calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lsfftw
else
-calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor" $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lfftw
+calf_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -disable-static -export-symbols-regex "lv2_descriptor" $(FLUIDSYNTH_DEPS_LIBS) -lsrfftw -lsfftw
endif
if USE_LV2_GUI
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list