Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename juce6 to juce6.1
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Sep 30, 2023
1 parent f2dbade commit 28532c5
Show file tree
Hide file tree
Showing 2,231 changed files with 73,674 additions and 25,058 deletions.
3 changes: 3 additions & 0 deletions libs/juce6/AppConfig.h → libs/juce6.1/AppConfig.h
Expand Up @@ -34,6 +34,9 @@
#define JUCE_MODULE_AVAILABLE_juce_audio_devices 0
#endif

// FIXME needed for some plugins
#define JUCE_MODAL_LOOPS_PERMITTED 1

//=============================================================================

#define JUCE_STANDALONE_APPLICATION 0
Expand Down
24 changes: 12 additions & 12 deletions libs/juce6/meson.build → libs/juce6.1/meson.build
@@ -1,7 +1,7 @@
###############################################################################

if linux_embed
juce6_srcs = [
juce61_srcs = [
'source/modules/juce_audio_basics/juce_audio_basics.cpp',
'source/modules/juce_audio_formats/juce_audio_formats.cpp',
'source/modules/juce_audio_processors/juce_audio_processors.cpp',
Expand All @@ -13,7 +13,7 @@ if linux_embed
'source/modules/juce_events/juce_events.cpp',
]
else
juce6_srcs = [
juce61_srcs = [
'source/modules/juce_audio_basics/juce_audio_basics.cpp',
'source/modules/juce_audio_formats/juce_audio_formats.cpp',
'source/modules/juce_audio_processors/juce_audio_processors.cpp',
Expand All @@ -30,50 +30,50 @@ else
]
endif

juce6_devices_srcs = [
juce61_devices_srcs = [
'source/modules/juce_audio_devices/juce_audio_devices.cpp',
]

juce6_extra_cpp_args = [
juce61_extra_cpp_args = [
'-std=gnu++14',
'-Wno-non-virtual-dtor',
]

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

lib_juce6 = static_library('juce6',
sources: juce6_srcs,
lib_juce6 = static_library('juce61',
sources: juce61_srcs,
include_directories: [
include_directories('.'),
include_directories('source'),
include_directories('source/modules'),
include_directories('../juced/source/dependancies/ladspa_sdk/src'),
],
cpp_args: build_flags_cpp + juce6_extra_cpp_args,
cpp_args: build_flags_cpp + juce61_extra_cpp_args,
dependencies: dependencies,
pic: true,
install: false,
)

lib_juce6_device = static_library('juce6-devices',
sources: juce6_devices_srcs,
lib_juce61_device = static_library('juce61-devices',
sources: juce61_devices_srcs,
include_directories: [
include_directories('.'),
include_directories('source'),
include_directories('source/modules'),
],
cpp_args: build_flags_cpp + juce6_extra_cpp_args + ['-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1'],
cpp_args: build_flags_cpp + juce61_extra_cpp_args + ['-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1'],
dependencies: dependencies_devices,
pic: true,
install: false,
Expand Down
@@ -1,8 +1,8 @@
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
index a19c7b05e..deabba6db 100644
index c6b87f32c..eeed76ba0 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
@@ -185,8 +185,8 @@ void AudioDeviceManager::createAudioDeviceTypes (OwnedArray<AudioIODeviceType>&
@@ -232,8 +232,8 @@ void AudioDeviceManager::createAudioDeviceTypes (OwnedArray<AudioIODeviceType>&
addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_CoreAudio());
addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_iOSAudio());
addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_Bela());
Expand Down

0 comments on commit 28532c5

Please sign in to comment.