Always build juce_gui_extra; Add new mingw std compat files

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -80,10 +80,8 @@ endif
 3RD_LIBS += $(MODULEDIR)/juce_events.a
 3RD_LIBS += $(MODULEDIR)/juce_graphics.a
 3RD_LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 3RD_LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
-endif
 
 ifeq ($(USING_RTAUDIO),true)
 3RD_LIBS += $(MODULEDIR)/rtaudio.a
@@ -269,10 +267,8 @@ LIBS_POSIX32 += $(MODULEDIR)/juce_core.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_events.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_graphics.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_gui_basics.posix32.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_POSIX32 += $(MODULEDIR)/juce_gui_extra.posix32.a
 endif
-endif
 
 posix32: $(LIBS_POSIX32)
 	$(MAKE) -C source/bridges-plugin posix32
@@ -295,10 +291,8 @@ LIBS_POSIX64 += $(MODULEDIR)/juce_core.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_events.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_graphics.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_gui_basics.posix64.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_POSIX64 += $(MODULEDIR)/juce_gui_extra.posix64.a
 endif
-endif
 
 posix64: $(LIBS_POSIX64)
 	$(MAKE) -C source/bridges-plugin posix64
@@ -320,10 +314,8 @@ LIBS_WIN32 += $(MODULEDIR)/juce_core.win32.a
 LIBS_WIN32 += $(MODULEDIR)/juce_events.win32.a
 LIBS_WIN32 += $(MODULEDIR)/juce_graphics.win32.a
 LIBS_WIN32 += $(MODULEDIR)/juce_gui_basics.win32.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_WIN32 += $(MODULEDIR)/juce_gui_extra.win32.a
 endif
-endif
 
 LIBS_WINE32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32e.a
 LIBS_RWIN32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32.a
@@ -357,10 +349,8 @@ LIBS_WIN64 += $(MODULEDIR)/juce_core.win64.a
 LIBS_WIN64 += $(MODULEDIR)/juce_events.win64.a
 LIBS_WIN64 += $(MODULEDIR)/juce_graphics.win64.a
 LIBS_WIN64 += $(MODULEDIR)/juce_gui_basics.win64.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_WIN64 += $(MODULEDIR)/juce_gui_extra.win64.a
 endif
-endif
 
 LIBS_WINE64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64e.a
 LIBS_RWIN64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64.a

source/Makefile.deps.mk

@@ -316,12 +316,6 @@ ifeq ($(HAVE_JUCE_LINUX_DEPS),true)
 USING_JUCE = true
 endif
 
-ifeq ($(USING_JUCE),true)
-ifeq ($(LINUX_OR_MACOS),true)
-USING_JUCE_GUI_EXTRA = true
-endif
-endif
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Set USING_RTAUDIO
 
@@ -559,10 +553,8 @@ STATIC_CARLA_PLUGIN_LIBS += $(JUCE_CORE_LIBS)
 STATIC_CARLA_PLUGIN_LIBS += $(JUCE_EVENTS_LIBS)
 STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GRAPHICS_LIBS)
 STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_EXTRA_LIBS)
 endif
-endif
 
 ifeq ($(EXTERNAL_PLUGINS),true)
 ifneq ($(DEBUG),true)

source/Makefile.mk

@@ -224,10 +224,6 @@ ifeq ($(USING_JUCE_AUDIO_DEVICES),true)
 BASE_FLAGS += -DUSING_JUCE_AUDIO_DEVICES
 endif
 
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
-BASE_FLAGS += -DUSING_JUCE_GUI_EXTRA
-endif
-
 ifeq ($(USING_RTAUDIO),true)
 BASE_FLAGS += -DUSING_RTAUDIO
 endif

source/backend/Makefile

@@ -56,10 +56,8 @@ STANDALONE_LIBS += $(MODULEDIR)/juce_data_structures.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_events.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_graphics.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 STANDALONE_LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
-endif
 
 ifeq ($(USING_RTAUDIO),true)
 STANDALONE_LIBS += $(MODULEDIR)/rtaudio.a
@@ -91,10 +89,8 @@ STANDALONE_LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 STANDALONE_LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
-endif
 
 ifeq ($(USING_RTAUDIO),true)
 STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)

source/backend/engine/Makefile

@@ -14,6 +14,12 @@ BUILD_CXX_FLAGS += -Wno-undef
 endif
 endif
 
+ifeq ($(USING_JUCE),true)
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I$(CWD)/modules/mingw-std-threads
+endif
+endif
+
 BUILD_CXX_FLAGS += $(MAGIC_FLAGS)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/backend/plugin/Makefile

@@ -14,6 +14,12 @@ BUILD_CXX_FLAGS += -Wno-undef
 endif
 endif
 
+ifeq ($(USING_JUCE),true)
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I$(CWD)/modules/mingw-std-threads
+endif
+endif
+
 BUILD_CXX_FLAGS += $(MAGIC_FLAGS)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/backend/utils/Makefile

@@ -37,10 +37,8 @@ LIBS += $(MODULEDIR)/juce_data_structures.a
 LIBS += $(MODULEDIR)/juce_events.a
 LIBS += $(MODULEDIR)/juce_graphics.a
 LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
-endif
 
 LINK_FLAGS += $(LILV_LIBS)
 LINK_FLAGS += $(WATER_LIBS)
@@ -61,10 +59,8 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
-endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 

source/bridges-plugin/Makefile

@@ -34,6 +34,12 @@ endif
 BUILD_CXX_FLAGS += -DBUILD_BRIDGE -I. -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils
 BUILD_CXX_FLAGS += -I$(CWD)/backend/engine -I$(CWD)/backend/plugin
 
+ifeq ($(USING_JUCE),true)
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I$(CWD)/modules/mingw-std-threads
+endif
+endif
+
 32BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 64BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 ARM32_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
@@ -133,13 +139,13 @@ LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
 LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_native  += $(MODULEDIR)/juce_gui_extra.a
 LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
 LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
+LIBS_win32   += $(MODULEDIR)/juce_gui_extra.win32.a
+LIBS_win64   += $(MODULEDIR)/juce_gui_extra.win64.a
 LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
 endif
-endif
 
 ifeq ($(JACKBRIDGE_DIRECT),true)
 LINK_FLAGS += $(JACK_LIBS)

source/discovery/Makefile

@@ -49,6 +49,12 @@ ifeq ($(USING_JUCE),true)
 BUILD_CXX_FLAGS += -std=gnu++14
 endif
 
+ifeq ($(USING_JUCE),true)
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I$(CWD)/modules/mingw-std-threads
+endif
+endif
+
 32BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 ARM32_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
@@ -138,14 +144,12 @@ LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
 LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS_native  += $(MODULEDIR)/juce_gui_extra.a
 LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
 LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
 LIBS_win32   += $(MODULEDIR)/juce_gui_extra.win32.a
 LIBS_win64   += $(MODULEDIR)/juce_gui_extra.win64.a
 LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
-endif # USING_JUCE_GUI_EXTRA
 endif # USING_JUCE
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -188,7 +192,7 @@ $(BINDIR)/$(MODULENAME)-native: $(OBJS_native) $(LIBS_native)
 $(BINDIR)/$(MODULENAME)-native.exe: $(OBJS_native) $(LIBS_native)
 	-@mkdir -p $(BINDIR)
 	@echo "Linking $(MODULENAME)-native.exe"
-	$(SILENT)$(CXX)$(OBJS_native)$(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
+	$(SILENT)$(CXX) $(OBJS_native) $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
 
 $(BINDIR)/$(MODULENAME)-arm32: $(OBJS_arm32) $(LIBS_arm32)
 	-@mkdir -p $(BINDIR)

source/modules/AppConfig.h

@@ -49,6 +49,7 @@
 #define JUCE_MODULE_AVAILABLE_juce_events                1
 #define JUCE_MODULE_AVAILABLE_juce_graphics              1
 #define JUCE_MODULE_AVAILABLE_juce_gui_basics            1
+#define JUCE_MODULE_AVAILABLE_juce_gui_extra             1
 
 // always disabled
 #define JUCE_MODULE_AVAILABLE_juce_audio_formats         0
@@ -65,12 +66,6 @@
 # define JUCE_MODULE_AVAILABLE_juce_audio_devices        0
 #endif
 
-#ifdef USING_JUCE_GUI_EXTRA
-# define JUCE_MODULE_AVAILABLE_juce_gui_extra            1
-#else
-# define JUCE_MODULE_AVAILABLE_juce_gui_extra            0
-#endif
-
 // misc
 #define JUCE_DISABLE_JUCE_VERSION_PRINTING 1
 #define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1

source/modules/carla_juce/Makefile

@@ -12,6 +12,10 @@ include ../Makefile.mk
 
 BUILD_CXX_FLAGS += -I.. -std=gnu++14
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_audio_basics/Makefile

@@ -21,6 +21,10 @@ BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I.. -std=gnu++14
 # endif
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_audio_devices/Makefile

@@ -18,6 +18,10 @@ ifeq ($(WIN32),true)
 BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include
 endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_audio_processors/Makefile

@@ -28,6 +28,10 @@ endif
 # endif
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_core/Makefile

@@ -16,6 +16,10 @@ BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.. -std=gnu++14
 # BUILD_CXX_FLAGS += -w
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_data_structures/Makefile

@@ -12,6 +12,10 @@ include ../Makefile.mk
 
 BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.. -std=gnu++14
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_events/Makefile

@@ -16,6 +16,10 @@ BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.. -std=gnu++14
 # BUILD_CXX_FLAGS += -Wno-missing-field-initializers
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_graphics/Makefile

@@ -19,6 +19,10 @@ endif
 # BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_gui_basics/Makefile

@@ -21,6 +21,10 @@ BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. -std=gnu++14
 # endif
 # endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/juce_gui_extra/Makefile

@@ -12,6 +12,10 @@ include ../Makefile.mk
 
 BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I.. -std=gnu++14
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../mingw-std-threads
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)

source/modules/mingw-std-threads/condition_variable

@@ -0,0 +1,3 @@
+#pragma once
+#include_next <condition_variable>
+#include "mingw.condition_variable.h"

source/modules/mingw-std-threads/mutex

@@ -0,0 +1,3 @@
+#pragma once
+#include_next <mutex>
+#include "mingw.mutex.h"

source/modules/mingw-std-threads/thread

@@ -0,0 +1,3 @@
+#pragma once
+#include_next <thread>
+#include "mingw.thread.h"

source/plugin/Makefile

@@ -81,10 +81,8 @@ LIBS += $(MODULEDIR)/juce_data_structures.a
 LIBS += $(MODULEDIR)/juce_events.a
 LIBS += $(MODULEDIR)/juce_graphics.a
 LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
-endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Link flags
@@ -110,10 +108,8 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
 LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
-endif
 
 ifeq ($(MACOS),true)
 SYMBOLS_NATIVE  = -Wl,-exported_symbol,_carla_get_native_rack_plugin