Fix Linux compilation issues caused by MSVC fixes

This commit is contained in:
Lukas W
2017-11-22 16:09:55 +01:00
parent 313d43bc16
commit 852708863a
11 changed files with 20 additions and 29 deletions

View File

@@ -1,12 +1,12 @@
INCLUDE(BuildPlugin)
# Disable C++11
SET(CMAKE_CXX_STANDARD 98)
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)

View File

@@ -24,6 +24,7 @@
*/
#include <QDomElement>
#include <QVarLengthArray>
#include "MultitapEchoControls.h"
#include "MultitapEcho.h"

View File

@@ -1,6 +1,3 @@
INCLUDE(BuildPlugin)
# Disable C++11
SET(CMAKE_CXX_STANDARD 98)
BUILD_PLUGIN(papu papu_instrument.cpp papu_instrument.h Basic_Gb_Apu.cpp Basic_Gb_Apu.h gb_apu/Gb_Oscs.cpp gb_apu/Gb_Apu.h gb_apu/Blip_Buffer.cpp gb_apu/Gb_Apu.cpp gb_apu/Gb_Oscs.h gb_apu/blargg_common.h gb_apu/Blip_Buffer.h gb_apu/Multi_Buffer.cpp gb_apu/blargg_source.h gb_apu/Multi_Buffer.h MOCFILES papu_instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

View File

@@ -71,6 +71,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

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)