More export fixes

This commit is contained in:
Lukas W
2017-11-28 18:45:21 +01:00
parent 90799d91ea
commit d454ef60e2
7 changed files with 8 additions and 6 deletions

View File

@@ -1390,7 +1390,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
{
return new GigInstrument( static_cast<InstrumentTrack *>( _data ) );
}

View File

@@ -884,7 +884,7 @@ __attribute__((destructor)) static void module_destroy()
extern "C" {
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main(Model *, void * _data) {
PLUGIN_EXPORT Plugin * lmms_plugin_main(Model *, void * _data) {
return (new Xpressive(static_cast<InstrumentTrack *>(_data)));
}

View File

@@ -43,7 +43,7 @@ Plugin::Descriptor PLUGIN_EXPORT carlapatchbay_plugin_descriptor =
NULL
} ;
Plugin* PLUGIN_EXPORT lmms_plugin_main(Model*, void* data)
PLUGIN_EXPORT Plugin* lmms_plugin_main(Model*, void* data)
{
return new CarlaInstrument(static_cast<InstrumentTrack*>(data), &carlapatchbay_plugin_descriptor, true);
}

View File

@@ -43,7 +43,7 @@ Plugin::Descriptor PLUGIN_EXPORT carlarack_plugin_descriptor =
NULL
} ;
Plugin* PLUGIN_EXPORT lmms_plugin_main(Model*, void* data)
PLUGIN_EXPORT Plugin* lmms_plugin_main(Model*, void* data)
{
return new CarlaInstrument(static_cast<InstrumentTrack*>(data), &carlarack_plugin_descriptor, false);
}

View File

@@ -1123,7 +1123,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
{
return new sf2Instrument( static_cast<InstrumentTrack *>( _data ) );
}

View File

@@ -756,7 +756,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model *, void * _data )
{
return new malletsInstrument( static_cast<InstrumentTrack *>( _data ) );
}

View File

@@ -1,5 +1,7 @@
set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "")
set(CMAKE_C_FLAGS_DEBUG "")
set(CMAKE_CXX_FLAGS_DEBUG "")
IF(LMMS_BUILD_LINUX)
set(BUILD_SHARED_LIBS OFF)