From f8ce4a57b789811732d92707e2443b3072df45be Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 2 Jun 2008 15:55:43 +0000 Subject: [PATCH] build win32-DLLs properly git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1047 0778d3d1-df1d-0410-868b-ea421aaaa00d --- plugins/bass_booster/Makefile.am | 19 ++++++++++++++-- plugins/bass_booster/bass_booster.cpp | 4 ++-- plugins/bit_invader/Makefile.am | 19 ++++++++++++++-- plugins/bit_invader/bit_invader.cpp | 4 ++-- plugins/flp_import/Makefile.am | 18 ++++++++++++++- plugins/flp_import/flp_import.cpp | 4 ++-- plugins/kicker/Makefile.am | 19 ++++++++++++++-- plugins/kicker/kicker.cpp | 4 ++-- plugins/ladspa_browser/Makefile.am | 25 ++++++++++++++++----- plugins/ladspa_browser/ladspa_browser.cpp | 8 +++---- plugins/ladspa_browser/ladspa_browser.h | 1 - plugins/ladspa_effect/Makefile.am | 18 +++++++++++++-- plugins/ladspa_effect/caps/Makefile.am | 18 ++++++++++----- plugins/ladspa_effect/ladspa_effect.cpp | 4 ++-- plugins/lb302/Makefile.am | 19 ++++++++++++++-- plugins/lb302/lb302.cpp | 4 ++-- plugins/live_tool/Makefile.am | 25 ++++++++++++++++----- plugins/live_tool/live_tool.cpp | 8 +++---- plugins/midi_import/Makefile.am | 18 ++++++++++++++- plugins/midi_import/midi_import.cpp | 6 ++--- plugins/organic/Makefile.am | 19 ++++++++++++++-- plugins/organic/organic.cpp | 4 ++-- plugins/patman/Makefile.am | 19 ++++++++++++++-- plugins/patman/patman.cpp | 4 ++-- plugins/sf2_player/Makefile.am | 19 ++++++++++++++-- plugins/sf2_player/patches_dialog.cpp | 2 +- plugins/sf2_player/patches_dialog.h | 2 +- plugins/sf2_player/sf2_player.cpp | 3 +-- plugins/stereo_enhancer/Makefile.am | 19 ++++++++++++++-- plugins/stereo_enhancer/stereo_enhancer.cpp | 4 ++-- plugins/stereo_matrix/Makefile.am | 18 +++++++++++++-- plugins/stereo_matrix/stereo_matrix.cpp | 4 ++-- plugins/vibed/Makefile.am | 18 +++++++++++++-- plugins/vibed/vibed.cpp | 4 ++-- 34 files changed, 307 insertions(+), 77 deletions(-) diff --git a/plugins/bass_booster/Makefile.am b/plugins/bass_booster/Makefile.am index 39de20393..ec36b173a 100644 --- a/plugins/bass_booster/Makefile.am +++ b/plugins/bass_booster/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = bassbooster + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bassbooster" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bassbooster" MOC_FILES = ./bassbooster_controls.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/bass_booster/bass_booster.cpp b/plugins/bass_booster/bass_booster.cpp index cb9c21ff9..d9156781e 100644 --- a/plugins/bass_booster/bass_booster.cpp +++ b/plugins/bass_booster/bass_booster.cpp @@ -33,7 +33,7 @@ extern "C" { -plugin::descriptor bassbooster_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT bassbooster_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "BassBooster Effect", @@ -104,7 +104,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model * _parent, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new bassBoosterEffect( _parent, static_cast( diff --git a/plugins/bit_invader/Makefile.am b/plugins/bit_invader/Makefile.am index 8e8a3a1c8..1da6abe6f 100644 --- a/plugins/bit_invader/Makefile.am +++ b/plugins/bit_invader/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = bitinvader + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bitinvader" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="bitinvader" MOC_FILES = ./bit_invader.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index ef617537b..8c3d64154 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -51,7 +51,7 @@ using namespace std; extern "C" { -plugin::descriptor bitinvader_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT bitinvader_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "BitInvader", @@ -550,7 +550,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( void * _data ) { return( new bitInvader( static_cast( _data ) ) ); } diff --git a/plugins/flp_import/Makefile.am b/plugins/flp_import/Makefile.am index e3e5f6c40..22f132f68 100644 --- a/plugins/flp_import/Makefile.am +++ b/plugins/flp_import/Makefile.am @@ -1,12 +1,28 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = flpimport + INCLUDES = -I$(top_srcdir)/include -I. -I./unrtf EXTRA_DIST = $(wildcard unrtf/*.c unrtf/*.h) -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="flpimport" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(DLL) pkglib_LTLIBRARIES= libflpimport.la diff --git a/plugins/flp_import/flp_import.cpp b/plugins/flp_import/flp_import.cpp index d11c6ab87..6c84ecac9 100644 --- a/plugins/flp_import/flp_import.cpp +++ b/plugins/flp_import/flp_import.cpp @@ -67,7 +67,7 @@ extern "C" { -plugin::descriptor flpimport_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT flpimport_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "FLP Import", @@ -929,7 +929,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new flpImport( static_cast( _data ) ) ); } diff --git a/plugins/kicker/Makefile.am b/plugins/kicker/Makefile.am index 147f8831b..de0b4c686 100644 --- a/plugins/kicker/Makefile.am +++ b/plugins/kicker/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = kicker + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="kicker" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="kicker" MOC_FILES = ./kicker.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 194df9193..5dc53b881 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -40,7 +40,7 @@ extern "C" { -plugin::descriptor kicker_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT kicker_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "Kicker", @@ -261,7 +261,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new kickerInstrument( static_cast( _data ) ) ); diff --git a/plugins/ladspa_browser/Makefile.am b/plugins/ladspa_browser/Makefile.am index a0a148d4d..5e6159b9c 100644 --- a/plugins/ladspa_browser/Makefile.am +++ b/plugins/ladspa_browser/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = ladspabrowser + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="ladspa_browser" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -15,7 +17,20 @@ MOC_FILES = ./ladspa_browser.moc \ ./ladspa_description.moc \ ./ladspa_port_dialog.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) @@ -28,13 +43,13 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h -pkglib_LTLIBRARIES = libladspa_browser.la +pkglib_LTLIBRARIES = libladspabrowser.la -libladspa_browser_la_SOURCES = ladspa_browser.cpp \ +libladspabrowser_la_SOURCES = ladspa_browser.cpp \ ladspa_browser.h \ ladspa_description.cpp \ ladspa_description.h \ ladspa_port_dialog.cpp \ ladspa_port_dialog.h -$(libladspa_browser_la_SOURCES): ./embedded_resources.h +$(libladspabrowser_la_SOURCES): ./embedded_resources.h diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index 78962dbe7..de5b777d1 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -47,7 +47,7 @@ extern "C" { -plugin::descriptor ladspa_browser_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "LADSPA Plugin Browser", @@ -62,7 +62,7 @@ plugin::descriptor ladspa_browser_plugin_descriptor = // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new ladspaBrowser ); } @@ -73,7 +73,7 @@ plugin * lmms_plugin_main( void * _data ) ladspaBrowser::ladspaBrowser( void ) : - tool( &ladspa_browser_plugin_descriptor, NULL ) + tool( &ladspabrowser_plugin_descriptor, NULL ) { } @@ -89,7 +89,7 @@ ladspaBrowser::~ladspaBrowser() QString ladspaBrowser::nodeName( void ) const { - return( ladspa_browser_plugin_descriptor.name ); + return( ladspabrowser_plugin_descriptor.name ); } diff --git a/plugins/ladspa_browser/ladspa_browser.h b/plugins/ladspa_browser/ladspa_browser.h index 326506e93..82b340bcd 100644 --- a/plugins/ladspa_browser/ladspa_browser.h +++ b/plugins/ladspa_browser/ladspa_browser.h @@ -45,7 +45,6 @@ public: public slots: void showPorts( const ladspa_key_t & _key ); - void displayHelp( void ); private: diff --git a/plugins/ladspa_effect/Makefile.am b/plugins/ladspa_effect/Makefile.am index 054b7a8d4..c9118aaba 100644 --- a/plugins/ladspa_effect/Makefile.am +++ b/plugins/ladspa_effect/Makefile.am @@ -4,11 +4,13 @@ if SHIP_CAPS SUBDIRS = caps endif +PLUGIN_NAME = ladspaeffect + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="ladspaeffect" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -17,8 +19,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="ladspaeffect" MOC_FILES = ./ladspa_effect.moc ./ladspa_controls.moc ./ladspa_control_dialog.moc +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/ladspa_effect/caps/Makefile.am b/plugins/ladspa_effect/caps/Makefile.am index 5b3bf6887..a0df83feb 100644 --- a/plugins/ladspa_effect/caps/Makefile.am +++ b/plugins/ladspa_effect/caps/Makefile.am @@ -8,16 +8,24 @@ SOURCES = $(wildcard *.cc) HDRS = $(wildcard *.h) $(wildcard dsp/*.h) OBJECTS = $(SOURCES:.cc=.o) -caps.so: $(OBJECTS) depend - $(CXX) -nostartfiles $(AM_CXXFLAGS) -shared -o $@ $(OBJECTS) +if BUILD_WIN32 +CAPS_SHARED=caps.dll +CAPS_LINKFLAGS= +else +CAPS_SHARED=caps.so +CAPS_LINKFLAGS=-nostartfiles +endif + +$(CAPS_SHARED): $(OBJECTS) depend + $(CXX) $(AM_CXXFLAGS) $(CAPS_LINKFLAGS) -shared -Wl,-no-undefined -o $@ $(OBJECTS) clean: - rm -f *.o *.so *.s depend + rm -f *.o *.so *.s *.dll depend install: all # strip caps.so install -d $(DEST) - install -m 644 caps.so $(DEST) + install -m 644 $(CAPS_SHARED) $(DEST) uninstall: -rm $(DEST)/caps.so @@ -28,6 +36,6 @@ depend: $(SOURCES) .cc.o: $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) -c $< -all: caps.so +all: $(CAPS_SHARED) EXTRA_DIST = $(SOURCES) $(HDRS) $(wildcard README*) diff --git a/plugins/ladspa_effect/ladspa_effect.cpp b/plugins/ladspa_effect/ladspa_effect.cpp index be73f19cc..c03f3527c 100644 --- a/plugins/ladspa_effect/ladspa_effect.cpp +++ b/plugins/ladspa_effect/ladspa_effect.cpp @@ -43,7 +43,7 @@ extern "C" { -plugin::descriptor ladspaeffect_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT ladspaeffect_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "LADSPA Effect", @@ -552,7 +552,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model * _parent, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new ladspaEffect( _parent, static_cast( diff --git a/plugins/lb302/Makefile.am b/plugins/lb302/Makefile.am index 8b6a1e1ac..1f52ddff3 100644 --- a/plugins/lb302/Makefile.am +++ b/plugins/lb302/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = lb302 + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="lb302" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="lb302" MOC_FILES = ./lb302.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index 315f53217..9fea0dc67 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -77,7 +77,7 @@ extern "C" { -plugin::descriptor lb302_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT lb302_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "LB302", @@ -1070,7 +1070,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new lb302Synth( diff --git a/plugins/live_tool/Makefile.am b/plugins/live_tool/Makefile.am index dfb52f14a..4e616ec64 100644 --- a/plugins/live_tool/Makefile.am +++ b/plugins/live_tool/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = livetool + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="live_tool" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="live_tool" MOC_FILES = ./live_tool.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) @@ -26,8 +41,8 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h -pkglib_LTLIBRARIES = liblive_tool.la +pkglib_LTLIBRARIES = liblivetool.la -liblive_tool_la_SOURCES = live_tool.cpp live_tool.h +liblivetool_la_SOURCES = live_tool.cpp live_tool.h -$(liblive_tool_la_SOURCES): ./embedded_resources.h +$(liblivetool_la_SOURCES): ./embedded_resources.h diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp index 7bec9cc48..83a17fa71 100644 --- a/plugins/live_tool/live_tool.cpp +++ b/plugins/live_tool/live_tool.cpp @@ -46,7 +46,7 @@ extern "C" { -plugin::descriptor live_tool_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT livetool_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "LiveTool", @@ -61,7 +61,7 @@ plugin::descriptor live_tool_plugin_descriptor = // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model * _parent, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new liveTool( _parent ) ); } @@ -72,7 +72,7 @@ plugin * lmms_plugin_main( model * _parent, void * _data ) liveTool::liveTool( model * _parent ) : - tool( &live_tool_plugin_descriptor, _parent ) + tool( &livetool_plugin_descriptor, _parent ) { } @@ -88,7 +88,7 @@ liveTool::~liveTool() QString liveTool::nodeName( void ) const { - return( live_tool_plugin_descriptor.name ); + return( livetool_plugin_descriptor.name ); } diff --git a/plugins/midi_import/Makefile.am b/plugins/midi_import/Makefile.am index b55bef0f1..876e6f89d 100644 --- a/plugins/midi_import/Makefile.am +++ b/plugins/midi_import/Makefile.am @@ -1,11 +1,27 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = midiimport + INCLUDES = -I$(top_srcdir)/include -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="midiimport" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(DLL) pkglib_LTLIBRARIES= libmidiimport.la diff --git a/plugins/midi_import/midi_import.cpp b/plugins/midi_import/midi_import.cpp index 5ff0aedab..22899e672 100644 --- a/plugins/midi_import/midi_import.cpp +++ b/plugins/midi_import/midi_import.cpp @@ -1,7 +1,7 @@ /* * midi_import.cpp - support for importing MIDI-files * - * Copyright (c) 2005-2007 Tobias Doerffel + * Copyright (c) 2005-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -46,7 +46,7 @@ extern "C" { -plugin::descriptor midiimport_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT midiimport_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "MIDI Import", @@ -620,7 +620,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new midiImport( static_cast( _data ) ) ); } diff --git a/plugins/organic/Makefile.am b/plugins/organic/Makefile.am index 1b2d058c9..f089e525d 100644 --- a/plugins/organic/Makefile.am +++ b/plugins/organic/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = organic + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="organic" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="organic" MOC_FILES = ./organic.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 9974749f6..b4e0361ee 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -47,7 +47,7 @@ extern "C" { -plugin::descriptor organic_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT organic_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "Organic", @@ -569,7 +569,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new organicInstrument( static_cast( _data ) ) ); } diff --git a/plugins/patman/Makefile.am b/plugins/patman/Makefile.am index bc6f207db..2ea32aa76 100644 --- a/plugins/patman/Makefile.am +++ b/plugins/patman/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = patman + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="patman" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="patman" MOC_FILES = ./patman.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index e84ebe207..a3c920023 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -48,7 +48,7 @@ extern "C" { -plugin::descriptor patman_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT patman_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "PatMan", @@ -63,7 +63,7 @@ plugin::descriptor patman_plugin_descriptor = // necessary for getting instance out of shared lib -plugin * lmms_plugin_main( model *, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model *, void * _data ) { return( new patmanInstrument( static_cast( _data ) ) ); } diff --git a/plugins/sf2_player/Makefile.am b/plugins/sf2_player/Makefile.am index 810b27315..2e54b12c8 100644 --- a/plugins/sf2_player/Makefile.am +++ b/plugins/sf2_player/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = sf2player + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="sf2player" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -18,7 +20,20 @@ MOC_FILES = ./sf2_player.moc ./patches_dialog.moc UIC_FILES = ./ui_patches_dialog.h -BUILT_SOURCES = $(MOC_FILES) ${UIC_FILES} ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) -lfluidsynth-1 && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) $(UIC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp index 518bc26ed..e683fe810 100644 --- a/plugins/sf2_player/patches_dialog.cpp +++ b/plugins/sf2_player/patches_dialog.cpp @@ -25,7 +25,7 @@ #include "patches_dialog.h" -#include +#include //#include diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h index 3f4aada0a..a7d191485 100644 --- a/plugins/sf2_player/patches_dialog.h +++ b/plugins/sf2_player/patches_dialog.h @@ -30,7 +30,7 @@ #include "lcd_spinbox.h" #include -#include +#include //---------------------------------------------------------------------------- // qsynthPresetForm -- UI wrapper form. diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index b7ab64a11..c5e818061 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -22,8 +22,7 @@ * */ -#include - +#include #include #include #include diff --git a/plugins/stereo_enhancer/Makefile.am b/plugins/stereo_enhancer/Makefile.am index f0ec7df49..5f0cb8c52 100644 --- a/plugins/stereo_enhancer/Makefile.am +++ b/plugins/stereo_enhancer/Makefile.am @@ -1,10 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = stereoenhancer + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="stereoenhancer" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +15,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="stereoenhancer" MOC_FILES = ./stereoenhancer_controls.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/stereo_enhancer/stereo_enhancer.cpp b/plugins/stereo_enhancer/stereo_enhancer.cpp index 32740311d..5c9a2c5f0 100644 --- a/plugins/stereo_enhancer/stereo_enhancer.cpp +++ b/plugins/stereo_enhancer/stereo_enhancer.cpp @@ -33,7 +33,7 @@ extern "C" { -plugin::descriptor stereoenhancer_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT stereoenhancer_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "StereoEnhancer Effect", @@ -165,7 +165,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model * _parent, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new stereoEnhancerEffect( _parent, static_cast( diff --git a/plugins/stereo_matrix/Makefile.am b/plugins/stereo_matrix/Makefile.am index cbc37e867..0e1f2c824 100644 --- a/plugins/stereo_matrix/Makefile.am +++ b/plugins/stereo_matrix/Makefile.am @@ -1,10 +1,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = stereomatrix INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="stereomatrix" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +14,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="stereomatrix" MOC_FILES = ./stereomatrix_controls.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/stereo_matrix/stereo_matrix.cpp b/plugins/stereo_matrix/stereo_matrix.cpp index c0af53f15..673676e9d 100644 --- a/plugins/stereo_matrix/stereo_matrix.cpp +++ b/plugins/stereo_matrix/stereo_matrix.cpp @@ -33,7 +33,7 @@ extern "C" { -plugin::descriptor stereomatrix_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "Stereophonic Matrix", @@ -114,7 +114,7 @@ extern "C" { // neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( model * _parent, void * _data ) +plugin * PLUGIN_EXPORT lmms_plugin_main( model * _parent, void * _data ) { return( new stereoMatrixEffect( _parent, static_cast( diff --git a/plugins/vibed/Makefile.am b/plugins/vibed/Makefile.am index db2195483..abdd52c34 100644 --- a/plugins/vibed/Makefile.am +++ b/plugins/vibed/Makefile.am @@ -1,10 +1,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 +PLUGIN_NAME = vibedstrings INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gui -I. -AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vibedstrings" +AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="$(PLUGIN_NAME)" %.moc: ./%.h @@ -13,7 +14,20 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) -DPLUGIN_NAME="vibedstrings" MOC_FILES = ./vibed.moc ./nine_button_selector.moc -BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h +if BUILD_WIN32 +DLL=$(PLUGIN_NAME).dll + +$(DLL): lib$(PLUGIN_NAME).la + $(CXX) *.o -L$(top_srcdir) -llmms-imp -shared -Wl,-no-undefined -o $@ $(QT_LDADD) && $(STRIP) $@ + +install-exec-hook: $(DLL) + cp $< $(pkglibdir) + rm $(pkglibdir)/lib$(PLUGIN_NAME).a $(pkglibdir)/lib$(PLUGIN_NAME).la +else +DLL= +endif + +BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h $(DLL) EMBEDDED_RESOURCES = $(wildcard *png) ./embedded_resources.h: $(EMBEDDED_RESOURCES) diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index c187e3132..77177fde6 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -48,7 +48,7 @@ extern "C" { -plugin::descriptor vibedstrings_plugin_descriptor = +plugin::descriptor PLUGIN_EXPORT vibedstrings_plugin_descriptor = { STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), "Vibed", @@ -756,7 +756,7 @@ extern "C" { // neccessary for getting instance out of shared lib - plugin * lmms_plugin_main( void * _data ) + plugin * PLUGIN_EXPORT lmms_plugin_main( void * _data ) { return( new vibed( static_cast( _data ) ) ); }