Browse Source

Fix vst3 mingw build, silence some warnings

Signed-off-by: falkTX <falktx@falktx.com>
tags/2020-12-27
falkTX 3 years ago
parent
commit
b1770b2258
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
6 changed files with 40 additions and 16 deletions
  1. +9
    -9
      libs/juce-current/meson.build
  2. +1
    -1
      libs/juce-current/source/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  3. +0
    -5
      libs/juce-current/source/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
  4. +11
    -1
      libs/juce-legacy/meson.build
  5. +12
    -0
      libs/juce-plugin/JucePluginUtils.cpp
  6. +7
    -0
      ports/meson.build

+ 9
- 9
libs/juce-current/meson.build View File

@@ -37,18 +37,18 @@ juce_current_extra_cpp_args = [
'-Wno-non-virtual-dtor',
]

# if os_windows
juce_current_extra_cpp_args += [
'-D_NATIVE_WCHAR_T_DEFINED',
'-D__wchar_t=wchar_t',
'-Wno-unknown-pragmas',
]
if host_machine.cpu() == 'x86'
if os_windows
juce_current_extra_cpp_args += [
'-mpreferred-stack-boundary=2',
'-D_NATIVE_WCHAR_T_DEFINED',
'-D__wchar_t=wchar_t',
'-Wno-unknown-pragmas',
]
if host_machine.cpu() == 'x86'
juce_current_extra_cpp_args += [
'-mpreferred-stack-boundary=2',
]
endif
endif
# endif

lib_juce_current = static_library('juce-current',
sources: juce_current_srcs,


+ 1
- 1
libs/juce-current/source/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -61,7 +61,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100)
#define PRAGMA_ALIGN_SUPPORTED 1
#endif
#ifndef _MSC_VER
#if ! JUCE_WINDOWS
#define __cdecl
#endif


+ 0
- 5
libs/juce-current/source/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h View File

@@ -73,11 +73,6 @@
#define JucePlugin_Build_RTAS 0
#endif
#if ! (defined (_MSC_VER) || defined (__APPLE_CPP__) || defined (__APPLE_CC__) || defined (LINUX) || defined (__linux__))
#undef JucePlugin_Build_VST3
#define JucePlugin_Build_VST3 0
#endif
//==============================================================================
#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI)
#error "You need to define the JucePlugin_LV2URI value!"


+ 11
- 1
libs/juce-legacy/meson.build View File

@@ -32,6 +32,16 @@ else
]
endif

juce_legacy_extra_cpp_args = [
'-Wno-non-virtual-dtor',
]

if os_windows
juce_legacy_extra_cpp_args += [
'-Wno-unknown-pragmas',
]
endif

lib_juce_legacy = static_library('juce-legacy',
sources: juce_legacy_srcs,
include_directories: [
@@ -40,7 +50,7 @@ lib_juce_legacy = static_library('juce-legacy',
include_directories('source' / 'modules'),
include_directories('..' / 'juced' / 'source' / 'dependancies' / 'ladspa_sdk' / 'src'),
],
cpp_args: build_flags_cpp,
cpp_args: build_flags_cpp + juce_legacy_extra_cpp_args,
dependencies: dependencies,
pic: true,
install: false,


+ 12
- 0
libs/juce-plugin/JucePluginUtils.cpp View File

@@ -7,8 +7,20 @@
*/

#include "AppConfig.h"

#define JUCE_CORE_INCLUDE_NATIVE_HEADERS 1
#define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
#include "modules/juce_gui_basics/juce_gui_basics.h"
#undef None

#include "JucePluginMain.h"

#if JucePlugin_Build_AU || JucePlugin_Build_LV2 || JucePlugin_Build_RTAS || JucePlugin_Build_VST || JucePlugin_Build_VST3 || JucePlugin_Build_Standalone
// all good here
#else
#error Invalid configuration
#endif

#if ! JucePlugin_Build_Standalone
#include "modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp"
#endif

+ 7
- 0
ports/meson.build View File

@@ -141,6 +141,13 @@ build_flags_plugin_vst3 = [
'-Wno-non-virtual-dtor',
]

if os_windows
build_flags_plugin_vst3 += [
'-D_NATIVE_WCHAR_T_DEFINED',
'-D__wchar_t=wchar_t',
]
endif

###############################################################################

foreach plugin : plugins


Loading…
Cancel
Save