Browse Source

Fixes for new juce with mingw

Signed-off-by: falkTX <falktx@falktx.com>
tags/2020-12-27
falkTX 4 years ago
parent
commit
80538f22b8
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 19 additions and 1 deletions
  1. +18
    -1
      libs/juce-current/meson.build
  2. +1
    -0
      meson.build

+ 18
- 1
libs/juce-current/meson.build View File

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


juce_current_extra_cpp_args = [
'-std=gnu++14',
]

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() == ''
juce_current_extra_cpp_args += [
'-mpreferred-stack-boundary=2',
]
endif
endif

lib_juce_current = static_library('juce-current', lib_juce_current = static_library('juce-current',
sources: juce_current_srcs, sources: juce_current_srcs,
include_directories: [ include_directories: [
@@ -40,7 +57,7 @@ lib_juce_current = static_library('juce-current',
include_directories('source/modules'), include_directories('source/modules'),
include_directories('..' / 'juced' / 'source' / 'dependancies' / 'ladspa_sdk' / 'src'), include_directories('..' / 'juced' / 'source' / 'dependancies' / 'ladspa_sdk' / 'src'),
], ],
cpp_args: build_flags_cpp + ['-std=gnu++14'],
cpp_args: build_flags_cpp + juce_current_extra_cpp_args,
dependencies: dependencies, dependencies: dependencies,
pic: true, pic: true,
install: false, install: false,


+ 1
- 0
meson.build View File

@@ -149,6 +149,7 @@ if os_darwin
elif os_windows elif os_windows
build_flags += [ build_flags += [
'-DWINDOWS=1', '-DWINDOWS=1',
'-mstackrealign',
] ]
build_flags_cpp += [ build_flags_cpp += [
'-fpermissive', '-fpermissive',


Loading…
Cancel
Save