hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #4000 from LMMS/fix/msvc

Browse Source 
MSVC fixes
This commit is contained in:
Lukas W
2017-11-24 11:58:12 +01:00
committed by GitHub
parent 26b0f74130 7fdbcc3c71
commit aa1406bac9
75 changed files with 217 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Amplifier/Amplifier.cpp
View File

@@ -138,7 +138,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new AmplifierEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/BassBooster/BassBooster.cpp
View File

@@ -148,7 +148,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new BassBoosterEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/Bitcrush/Bitcrush.cpp
View File

@@ -244,7 +244,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new BitcrushEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

21
plugins/CMakeLists.txt
View File

@@ -1,8 +1,9 @@
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
SET(CMAKE_DEBUG_POSTFIX "")
# Enable C++11
ADD_DEFINITIONS(-std=c++0x)
SET(CMAKE_CXX_STANDARD 11)
IF(LMMS_BUILD_APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
@@ -86,6 +87,24 @@ IF("${PLUGIN_LIST}" STREQUAL "")
ENDIF("${PLUGIN_LIST}" STREQUAL "")
IF(MSVC)
SET(MSVC_INCOMPATIBLE_PLUGINS
LadspaEffect
monstro
organic
ReverbSC
sid
vestige
vibed
vst_base
VstEffect
Xpressive
zynaddsubfx
)
message(WARNING "Compiling with MSVC. The following plugins are not available: ${MSVC_INCOMPATIBLE_PLUGINS}")
LIST(REMOVE_ITEM PLUGIN_LIST ${MSVC_INCOMPATIBLE_PLUGINS})
ENDIF()
FOREACH(PLUGIN ${PLUGIN_LIST})
ADD_SUBDIRECTORY(${PLUGIN})
ENDFOREACH()

2
plugins/CrossoverEQ/CrossoverEQ.cpp
View File

@@ -215,7 +215,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new CrossoverEQEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/Delay/DelayEffect.cpp
View File

@@ -157,7 +157,7 @@ extern "C"
{
//needed for getting plugin out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new DelayEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/DualFilter/DualFilter.cpp
View File

@@ -222,7 +222,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new DualFilterEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

4
plugins/DualFilter/DualFilterControls.cpp
View File

@@ -40,7 +40,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled1Model( true, this, tr( "Filter 1 enabled" ) ),
m_filter1Model( this, tr( "Filter 1 type" ) ),
m_cut1Model( 7000.0f, 1.0f, 20000.0f, 1.0f, this, tr( "Cutoff 1 frequency" ) ),
m_res1Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_res1Model( 0.5, BasicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_gain1Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 1" ) ),
m_mixModel( 0.0f, -1.0f, 1.0f, 0.01f, this, tr( "Mix" ) ),
@@ -48,7 +48,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled2Model( true, this, tr( "Filter 2 enabled" ) ),
m_filter2Model( this, tr( "Filter 2 type" ) ),
m_cut2Model( 7000.0f, 1.0f, 20000.0f, 1.0f, this, tr( "Cutoff 2 frequency" ) ),
m_res2Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_res2Model( 0.5, BasicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_gain2Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 2" ) )
{
m_filter1Model.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );

2
plugins/Eq/EqEffect.cpp
View File

@@ -418,7 +418,7 @@ extern "C"
{
//needed for getting plugin out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new EqEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/Flanger/FlangerEffect.cpp
View File

@@ -143,7 +143,7 @@ extern "C"
{
//needed for getting plugin out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new FlangerEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/FreeBoy/FreeBoy.cpp
View File

@@ -744,7 +744,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 FreeBoyInstrument(
static_cast<InstrumentTrack *>( _data ) ) );

2
plugins/GigPlayer/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ if(LMMS_HAVE_GIG)
# Disable C++11 on Clang until gig.h is patched
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
REMOVE_DEFINITIONS(-std=c++0x)
SET(CMAKE_CXX_STANDARD 98)
ENDIF()
# Required for not crashing loading files with libgig

2
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -340,7 +340,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 HydrogenImport( QString::fromUtf8(
static_cast<const char *>( _data ) ) );

10
plugins/LadspaEffect/CMakeLists.txt
View File

@@ -1,16 +1,12 @@
INCLUDE(BuildPlugin)
# Disable C++11
REMOVE_DEFINITIONS(-std=c++0x)
# Enable C++11 for CXXFLAGS only and not for Windows
IF(NOT LMMS_BUILD_WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
ENDIF()
BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES logo.png)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ladspa")
# Disable C++11
SET(CMAKE_CXX_STANDARD 98)
IF(WANT_CAPS)
ADD_SUBDIRECTORY(caps)
ENDIF(WANT_CAPS)

7
plugins/LadspaEffect/LadspaEffect.cpp
View File

@@ -24,6 +24,7 @@
*/
#include <QtCore/QVarLengthArray>
#include <QMessageBox>
#include "LadspaEffect.h"
@@ -141,12 +142,12 @@ bool LadspaEffect::processAudioBuffer( sampleFrame * _buf,
int frames = _frames;
sampleFrame * o_buf = NULL;
sampleFrame sBuf [_frames];
QVarLengthArray<sample_t> sBuf(_frames * DEFAULT_CHANNELS);
if( m_maxSampleRate < Engine::mixer()->processingSampleRate() )
{
o_buf = _buf;
_buf = &sBuf[0];
_buf = reinterpret_cast<sampleFrame*>(sBuf.data());
sampleDown( o_buf, _buf, m_maxSampleRate );
frames = _frames * m_maxSampleRate /
Engine::mixer()->processingSampleRate();
@@ -593,7 +594,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return new LadspaEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

2
plugins/MidiExport/MidiExport.cpp
View File

@@ -347,7 +347,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 MidiExport();
}

2
plugins/MidiImport/MidiImport.cpp
View File

@@ -611,7 +611,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 MidiImport( QString::fromUtf8(
static_cast<const char *>( _data ) ) );

2
plugins/MultitapEcho/MultitapEcho.cpp
View File

@@ -164,7 +164,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new MultitapEchoEffect( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

5
plugins/MultitapEcho/MultitapEchoControls.cpp
View File

@@ -24,6 +24,7 @@
*/
#include <QDomElement>
#include <QVarLengthArray>
#include "MultitapEchoControls.h"
#include "MultitapEcho.h"
@@ -102,7 +103,7 @@ void MultitapEchoControls::setDefaultAmpShape()
{
const int length = m_steps.value();
float samples [length];
QVarLengthArray<float> samples(length);
for( int i = 0; i < length; ++i )
{
samples[i] = 0.0f;
@@ -116,7 +117,7 @@ void MultitapEchoControls::setDefaultLpShape()
{
const int length = m_steps.value();
float samples [length];
QVarLengthArray<float> samples(length);
for( int i = 0; i < length; ++i )
{
samples[i] = 3.0f;

6
plugins/OpulenZ/CMakeLists.txt
View File

@@ -1,11 +1,9 @@
INCLUDE(BuildPlugin)
# Enable C++11 for CXXFLAGS only
REMOVE_DEFINITIONS(-std=c++0x)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
# Avoid unused warnings for mididata.h
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
ENDIF()
INCLUDE_DIRECTORIES(adplug/src)

2
plugins/OpulenZ/OpulenZ.cpp
View File

@@ -77,7 +77,7 @@ Plugin::Descriptor PLUGIN_EXPORT opulenz_plugin_descriptor =
};
// 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 OpulenzInstrument( static_cast<InstrumentTrack *>( _data ) ) );
}

5
plugins/ReverbSC/CMakeLists.txt
View File

@@ -1,10 +1,5 @@
INCLUDE(BuildPlugin)
# Enable C++11 for CXXFLAGS only
# This is needed since this plugin uses C. Otherwise Travis fails
REMOVE_DEFINITIONS(-std=c++0x)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
BUILD_PLUGIN(
reverbsc
ReverbSC.cpp

2
plugins/ReverbSC/ReverbSC.cpp
View File

@@ -151,7 +151,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new ReverbSCEffect(
parent,

2
plugins/SpectrumAnalyzer/SpectrumAnalyzer.cpp
View File

@@ -163,7 +163,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model* parent, void* data )
{
return new SpectrumAnalyzer( parent, static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
}

2
plugins/VstEffect/VstEffect.cpp
View File

@@ -171,7 +171,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return new VstEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

4
plugins/Xpressive/CMakeLists.txt
View File

@@ -11,12 +11,12 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")
# See https://github.com/ArashPartow/exprtk/pull/9
IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
EXECUTE_PROCESS(COMMAND patch exprtk/exprtk.hpp exprtk.hpp.patch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
ENDIF()
IF(LMMS_BUILD_WIN32)
IF(LMMS_BUILD_WIN32 AND NOT MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
ENDIF()

2
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -1319,7 +1319,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 audioFileProcessor(
static_cast<InstrumentTrack *>( _data ) );

2
plugins/bit_invader/bit_invader.cpp
View File

@@ -582,7 +582,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 bitInvader( static_cast<InstrumentTrack *>( _data ) ) );
}

2
plugins/dynamics_processor/dynamics_processor.cpp
View File

@@ -233,7 +233,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return( new dynProcEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

2
plugins/kicker/kicker.cpp
View File

@@ -367,7 +367,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 kickerInstrument( static_cast<InstrumentTrack *>( _data ) );
}

2
plugins/ladspa_browser/ladspa_browser.cpp
View File

@@ -61,7 +61,7 @@ Plugin::Descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor =
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return new ladspaBrowser;
}

2
plugins/lb302/lb302.cpp
View File

@@ -1041,7 +1041,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 lb302Synth(

2
plugins/monstro/Monstro.cpp
View File

@@ -1965,7 +1965,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 MonstroInstrument( static_cast<InstrumentTrack *>( _data ) );
}

2
plugins/nes/Nes.cpp
View File

@@ -917,7 +917,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 NesInstrument( static_cast<InstrumentTrack *>( _data ) ) );
}

2
plugins/organic/organic.cpp
View File

@@ -641,7 +641,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 organicInstrument( static_cast<InstrumentTrack *>( _data ) ) );
}

2
plugins/patman/patman.cpp
View File

@@ -66,7 +66,7 @@ Plugin::Descriptor PLUGIN_EXPORT patman_plugin_descriptor =
// 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 patmanInstrument( static_cast<InstrumentTrack *>( _data ) );
}

2
plugins/peak_controller_effect/peak_controller_effect.cpp
View File

@@ -148,7 +148,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return new PeakControllerEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( _data ) );

2
plugins/sfxr/sfxr.cpp
View File

@@ -1120,7 +1120,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 sfxrInstrument( static_cast<InstrumentTrack *>( data ) );
}

2
plugins/sid/sid_instrument.cpp
View File

@@ -822,7 +822,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 sidInstrument(
static_cast<InstrumentTrack *>( _data ) ) );

2
plugins/stereo_enhancer/stereo_enhancer.cpp
View File

@@ -163,7 +163,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return( new stereoEnhancerEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

2
plugins/stereo_matrix/stereo_matrix.cpp
View File

@@ -113,7 +113,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return( new stereoMatrixEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

2
plugins/triple_oscillator/TripleOscillator.cpp
View File

@@ -791,7 +791,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 TripleOscillator( static_cast<InstrumentTrack *>( _data ) );
}

2
plugins/vestige/vestige.cpp
View File

@@ -1141,7 +1141,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 vestigeInstrument( static_cast<InstrumentTrack *>( _data ) );
}

2
plugins/vibed/vibed.cpp
View File

@@ -777,7 +777,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 vibed( static_cast<InstrumentTrack *>( _data ) ) );
}

1
plugins/vst_base/CMakeLists.txt
View File

@@ -52,6 +52,7 @@ ADD_CUSTOM_COMMAND(
-L${WINE_LIBRARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp
-ansi -mwindows -lpthread ${EXTRA_FLAGS} -fno-omit-frame-pointer
-std=c++0x
${WINE_BUILD_FLAGS}
-o ../RemoteVstPlugin
# Ensure correct file extension

2
plugins/watsyn/Watsyn.cpp
View File

@@ -1278,7 +1278,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 WatsynInstrument( static_cast<InstrumentTrack *>( _data ) ) );
}

2
plugins/waveshaper/waveshaper.cpp
View File

@@ -161,7 +161,7 @@ extern "C"
{
// necessary for getting instance out of shared lib
Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
{
return( new waveShaperEffect( _parent,
static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(

6
plugins/zynaddsubfx/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
INCLUDE(BuildPlugin)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# definitions for ZynAddSubFX
IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
@@ -24,9 +25,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wno-write-strings -Wno-deprecated-d
IF(LMMS_BUILD_WIN32)
# link system-libraries
ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
# fix X11 headers errors caused by bug with mingw + c++11
REMOVE_DEFINITIONS(-std=c++0x)
ADD_DEFINITIONS(-std=gnu++0x)
# fix X11 headers errors caused by bug with mingw + c++11 (enable -std=gnu++0x)
SET(CMAKE_CXX_EXTENSIONS ON)
ENDIF(LMMS_BUILD_WIN32)
SET(FLTK_SKIP_OPENGL TRUE)

2
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -658,7 +658,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 ZynAddSubFxInstrument( static_cast<InstrumentTrack *>( _data ) );