falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Always build juce_gui_extra; Add new mingw std compat files 

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.0
falkTX 2 years ago
parent
960bf5917e
commit
7a611594be
24 changed files with 77 additions and 45 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -10
      Makefile
  2. +0
    -8
      source/Makefile.deps.mk
  3. +0
    -4
      source/Makefile.mk
  4. +0
    -4
      source/backend/Makefile
  5. +6
    -0
      source/backend/engine/Makefile
  6. +6
    -0
      source/backend/plugin/Makefile
  7. +0
    -4
      source/backend/utils/Makefile
  8. +8
    -2
      source/bridges-plugin/Makefile
  9. +7
    -3
      source/discovery/Makefile
  10. +1
    -6
      source/modules/AppConfig.h
  11. +4
    -0
      source/modules/carla_juce/Makefile
  12. +4
    -0
      source/modules/juce_audio_basics/Makefile
  13. +4
    -0
      source/modules/juce_audio_devices/Makefile
  14. +4
    -0
      source/modules/juce_audio_processors/Makefile
  15. +4
    -0
      source/modules/juce_core/Makefile
  16. +4
    -0
      source/modules/juce_data_structures/Makefile
  17. +4
    -0
      source/modules/juce_events/Makefile
  18. +4
    -0
      source/modules/juce_graphics/Makefile
  19. +4
    -0
      source/modules/juce_gui_basics/Makefile
  20. +4
    -0
      source/modules/juce_gui_extra/Makefile
  21. +3
    -0
      source/modules/mingw-std-threads/condition_variable
  22. +3
    -0
      source/modules/mingw-std-threads/mutex
  23. +3
    -0
      source/modules/mingw-std-threads/thread
  24. +0
    -4
      source/plugin/Makefile

+ 0
- 10
Makefile View File

@@ -80,10 +80,8 @@ endif
3RD_LIBS += $(MODULEDIR)/juce_events.a 3RD_LIBS += $(MODULEDIR)/juce_events.a
3RD_LIBS += $(MODULEDIR)/juce_graphics.a 3RD_LIBS += $(MODULEDIR)/juce_graphics.a
3RD_LIBS += $(MODULEDIR)/juce_gui_basics.a 3RD_LIBS += $(MODULEDIR)/juce_gui_basics.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
3RD_LIBS += $(MODULEDIR)/juce_gui_extra.a 3RD_LIBS += $(MODULEDIR)/juce_gui_extra.a
endif endif
endif


ifeq ($(USING_RTAUDIO),true) ifeq ($(USING_RTAUDIO),true)
3RD_LIBS += $(MODULEDIR)/rtaudio.a 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_events.posix32.a
LIBS_POSIX32 += $(MODULEDIR)/juce_graphics.posix32.a LIBS_POSIX32 += $(MODULEDIR)/juce_graphics.posix32.a
LIBS_POSIX32 += $(MODULEDIR)/juce_gui_basics.posix32.a LIBS_POSIX32 += $(MODULEDIR)/juce_gui_basics.posix32.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_POSIX32 += $(MODULEDIR)/juce_gui_extra.posix32.a LIBS_POSIX32 += $(MODULEDIR)/juce_gui_extra.posix32.a
endif endif
endif


posix32: $(LIBS_POSIX32) posix32: $(LIBS_POSIX32)
$(MAKE) -C source/bridges-plugin 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_events.posix64.a
LIBS_POSIX64 += $(MODULEDIR)/juce_graphics.posix64.a LIBS_POSIX64 += $(MODULEDIR)/juce_graphics.posix64.a
LIBS_POSIX64 += $(MODULEDIR)/juce_gui_basics.posix64.a LIBS_POSIX64 += $(MODULEDIR)/juce_gui_basics.posix64.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_POSIX64 += $(MODULEDIR)/juce_gui_extra.posix64.a LIBS_POSIX64 += $(MODULEDIR)/juce_gui_extra.posix64.a
endif endif
endif


posix64: $(LIBS_POSIX64) posix64: $(LIBS_POSIX64)
$(MAKE) -C source/bridges-plugin 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_events.win32.a
LIBS_WIN32 += $(MODULEDIR)/juce_graphics.win32.a LIBS_WIN32 += $(MODULEDIR)/juce_graphics.win32.a
LIBS_WIN32 += $(MODULEDIR)/juce_gui_basics.win32.a LIBS_WIN32 += $(MODULEDIR)/juce_gui_basics.win32.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_WIN32 += $(MODULEDIR)/juce_gui_extra.win32.a LIBS_WIN32 += $(MODULEDIR)/juce_gui_extra.win32.a
endif endif
endif


LIBS_WINE32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32e.a LIBS_WINE32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32e.a
LIBS_RWIN32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32.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_events.win64.a
LIBS_WIN64 += $(MODULEDIR)/juce_graphics.win64.a LIBS_WIN64 += $(MODULEDIR)/juce_graphics.win64.a
LIBS_WIN64 += $(MODULEDIR)/juce_gui_basics.win64.a LIBS_WIN64 += $(MODULEDIR)/juce_gui_basics.win64.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_WIN64 += $(MODULEDIR)/juce_gui_extra.win64.a LIBS_WIN64 += $(MODULEDIR)/juce_gui_extra.win64.a
endif endif
endif


LIBS_WINE64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64e.a LIBS_WINE64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64e.a
LIBS_RWIN64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64.a LIBS_RWIN64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64.a


+ 0
- 8
source/Makefile.deps.mk View File

@@ -316,12 +316,6 @@ ifeq ($(HAVE_JUCE_LINUX_DEPS),true)
USING_JUCE = true USING_JUCE = true
endif endif


ifeq ($(USING_JUCE),true)
ifeq ($(LINUX_OR_MACOS),true)
USING_JUCE_GUI_EXTRA = true
endif
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Set USING_RTAUDIO # 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_EVENTS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GRAPHICS_LIBS) STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GRAPHICS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_BASICS_LIBS) STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_BASICS_LIBS)
ifeq ($(USING_JUCE_GUI_EXTRA),true)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_EXTRA_LIBS) STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_EXTRA_LIBS)
endif endif
endif


ifeq ($(EXTERNAL_PLUGINS),true) ifeq ($(EXTERNAL_PLUGINS),true)
ifneq ($(DEBUG),true) ifneq ($(DEBUG),true)


+ 0
- 4
source/Makefile.mk View File

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


ifeq ($(USING_JUCE_GUI_EXTRA),true)
BASE_FLAGS += -DUSING_JUCE_GUI_EXTRA
endif

ifeq ($(USING_RTAUDIO),true) ifeq ($(USING_RTAUDIO),true)
BASE_FLAGS += -DUSING_RTAUDIO BASE_FLAGS += -DUSING_RTAUDIO
endif endif


+ 0
- 4
source/backend/Makefile View File

@@ -56,10 +56,8 @@ STANDALONE_LIBS += $(MODULEDIR)/juce_data_structures.a
STANDALONE_LIBS += $(MODULEDIR)/juce_events.a STANDALONE_LIBS += $(MODULEDIR)/juce_events.a
STANDALONE_LIBS += $(MODULEDIR)/juce_graphics.a STANDALONE_LIBS += $(MODULEDIR)/juce_graphics.a
STANDALONE_LIBS += $(MODULEDIR)/juce_gui_basics.a STANDALONE_LIBS += $(MODULEDIR)/juce_gui_basics.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
STANDALONE_LIBS += $(MODULEDIR)/juce_gui_extra.a STANDALONE_LIBS += $(MODULEDIR)/juce_gui_extra.a
endif endif
endif


ifeq ($(USING_RTAUDIO),true) ifeq ($(USING_RTAUDIO),true)
STANDALONE_LIBS += $(MODULEDIR)/rtaudio.a 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_EVENTS_LIBS)
STANDALONE_LINK_FLAGS += $(JUCE_GRAPHICS_LIBS) STANDALONE_LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
STANDALONE_LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) STANDALONE_LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
ifeq ($(USING_JUCE_GUI_EXTRA),true)
STANDALONE_LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) STANDALONE_LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif endif
endif


ifeq ($(USING_RTAUDIO),true) ifeq ($(USING_RTAUDIO),true)
STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS) STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)


+ 6
- 0
source/backend/engine/Makefile View File

@@ -14,6 +14,12 @@ BUILD_CXX_FLAGS += -Wno-undef
endif endif
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) BUILD_CXX_FLAGS += $(MAGIC_FLAGS)


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


+ 6
- 0
source/backend/plugin/Makefile View File

@@ -14,6 +14,12 @@ BUILD_CXX_FLAGS += -Wno-undef
endif endif
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) BUILD_CXX_FLAGS += $(MAGIC_FLAGS)


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


+ 0
- 4
source/backend/utils/Makefile View File

@@ -37,10 +37,8 @@ LIBS += $(MODULEDIR)/juce_data_structures.a
LIBS += $(MODULEDIR)/juce_events.a LIBS += $(MODULEDIR)/juce_events.a
LIBS += $(MODULEDIR)/juce_graphics.a LIBS += $(MODULEDIR)/juce_graphics.a
LIBS += $(MODULEDIR)/juce_gui_basics.a LIBS += $(MODULEDIR)/juce_gui_basics.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS += $(MODULEDIR)/juce_gui_extra.a LIBS += $(MODULEDIR)/juce_gui_extra.a
endif endif
endif


LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(LILV_LIBS)
LINK_FLAGS += $(WATER_LIBS) LINK_FLAGS += $(WATER_LIBS)
@@ -61,10 +59,8 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
LINK_FLAGS += $(JUCE_EVENTS_LIBS) LINK_FLAGS += $(JUCE_EVENTS_LIBS)
LINK_FLAGS += $(JUCE_GRAPHICS_LIBS) LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif endif
endif


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------




+ 8
- 2
source/bridges-plugin/Makefile View File

@@ -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 += -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 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 32BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
64BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH 64BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
ARM32_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 LIBS_win64 += $(MODULEDIR)/juce_gui_basics.win64.a
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)


ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_native += $(MODULEDIR)/juce_gui_extra.a LIBS_native += $(MODULEDIR)/juce_gui_extra.a
LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.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) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif endif
endif


ifeq ($(JACKBRIDGE_DIRECT),true) ifeq ($(JACKBRIDGE_DIRECT),true)
LINK_FLAGS += $(JACK_LIBS) LINK_FLAGS += $(JACK_LIBS)


+ 7
- 3
source/discovery/Makefile View File

@@ -49,6 +49,12 @@ ifeq ($(USING_JUCE),true)
BUILD_CXX_FLAGS += -std=gnu++14 BUILD_CXX_FLAGS += -std=gnu++14
endif 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 32BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH 64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH
ARM32_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 LIBS_win64 += $(MODULEDIR)/juce_gui_basics.win64.a
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)


ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS_native += $(MODULEDIR)/juce_gui_extra.a LIBS_native += $(MODULEDIR)/juce_gui_extra.a
LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
LIBS_win32 += $(MODULEDIR)/juce_gui_extra.win32.a LIBS_win32 += $(MODULEDIR)/juce_gui_extra.win32.a
LIBS_win64 += $(MODULEDIR)/juce_gui_extra.win64.a LIBS_win64 += $(MODULEDIR)/juce_gui_extra.win64.a
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif # USING_JUCE_GUI_EXTRA
endif # USING_JUCE endif # USING_JUCE


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
@@ -188,7 +192,7 @@ $(BINDIR)/$(MODULENAME)-native: $(OBJS_native) $(LIBS_native)
$(BINDIR)/$(MODULENAME)-native.exe: $(OBJS_native) $(LIBS_native) $(BINDIR)/$(MODULENAME)-native.exe: $(OBJS_native) $(LIBS_native)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)
@echo "Linking $(MODULENAME)-native.exe" @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) $(BINDIR)/$(MODULENAME)-arm32: $(OBJS_arm32) $(LIBS_arm32)
-@mkdir -p $(BINDIR) -@mkdir -p $(BINDIR)


+ 1
- 6
source/modules/AppConfig.h View File

@@ -49,6 +49,7 @@
#define JUCE_MODULE_AVAILABLE_juce_events 1 #define JUCE_MODULE_AVAILABLE_juce_events 1
#define JUCE_MODULE_AVAILABLE_juce_graphics 1 #define JUCE_MODULE_AVAILABLE_juce_graphics 1
#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 #define JUCE_MODULE_AVAILABLE_juce_gui_basics 1
#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1
// always disabled // always disabled
#define JUCE_MODULE_AVAILABLE_juce_audio_formats 0 #define JUCE_MODULE_AVAILABLE_juce_audio_formats 0
@@ -65,12 +66,6 @@
# define JUCE_MODULE_AVAILABLE_juce_audio_devices 0 # define JUCE_MODULE_AVAILABLE_juce_audio_devices 0
#endif #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 // misc
#define JUCE_DISABLE_JUCE_VERSION_PRINTING 1 #define JUCE_DISABLE_JUCE_VERSION_PRINTING 1
#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 #define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1


+ 4
- 0
source/modules/carla_juce/Makefile View File

@@ -12,6 +12,10 @@ include ../Makefile.mk


BUILD_CXX_FLAGS += -I.. -std=gnu++14 BUILD_CXX_FLAGS += -I.. -std=gnu++14


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_audio_basics/Makefile View File

@@ -21,6 +21,10 @@ BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I.. -std=gnu++14
# endif # endif
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_audio_devices/Makefile View File

@@ -18,6 +18,10 @@ ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include
endif endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_audio_processors/Makefile View File

@@ -28,6 +28,10 @@ endif
# endif # endif
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_core/Makefile View File

@@ -16,6 +16,10 @@ BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.. -std=gnu++14
# BUILD_CXX_FLAGS += -w # BUILD_CXX_FLAGS += -w
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_data_structures/Makefile View File

@@ -12,6 +12,10 @@ include ../Makefile.mk


BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.. -std=gnu++14 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) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_events/Makefile View File

@@ -16,6 +16,10 @@ BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.. -std=gnu++14
# BUILD_CXX_FLAGS += -Wno-missing-field-initializers # BUILD_CXX_FLAGS += -Wno-missing-field-initializers
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_graphics/Makefile View File

@@ -19,6 +19,10 @@ endif
# BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow # BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_gui_basics/Makefile View File

@@ -21,6 +21,10 @@ BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. -std=gnu++14
# endif # endif
# endif # endif


ifeq ($(WIN32),true)
BUILD_CXX_FLAGS += -I../mingw-std-threads
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


ifeq ($(MACOS),true) ifeq ($(MACOS),true)


+ 4
- 0
source/modules/juce_gui_extra/Makefile View File

@@ -12,6 +12,10 @@ include ../Makefile.mk


BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I.. -std=gnu++14 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) ifeq ($(MACOS),true)


+ 3
- 0
source/modules/mingw-std-threads/condition_variable View File

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

+ 3
- 0
source/modules/mingw-std-threads/mutex View File

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

+ 3
- 0
source/modules/mingw-std-threads/thread View File

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

+ 0
- 4
source/plugin/Makefile View File

@@ -81,10 +81,8 @@ LIBS += $(MODULEDIR)/juce_data_structures.a
LIBS += $(MODULEDIR)/juce_events.a LIBS += $(MODULEDIR)/juce_events.a
LIBS += $(MODULEDIR)/juce_graphics.a LIBS += $(MODULEDIR)/juce_graphics.a
LIBS += $(MODULEDIR)/juce_gui_basics.a LIBS += $(MODULEDIR)/juce_gui_basics.a
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LIBS += $(MODULEDIR)/juce_gui_extra.a LIBS += $(MODULEDIR)/juce_gui_extra.a
endif endif
endif


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Link flags # Link flags
@@ -110,10 +108,8 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
LINK_FLAGS += $(JUCE_EVENTS_LIBS) LINK_FLAGS += $(JUCE_EVENTS_LIBS)
LINK_FLAGS += $(JUCE_GRAPHICS_LIBS) LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
ifeq ($(USING_JUCE_GUI_EXTRA),true)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif endif
endif


ifeq ($(MACOS),true) ifeq ($(MACOS),true)
SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin


Write Preview
Loading…
Cancel
Save