From a9142d43a7efbf469ccdbcb4c84a0cbd132a56ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rence=20Clastres?= Date: Sun, 10 May 2020 15:10:53 +0200 Subject: [PATCH] Fix JUCE compilation on Linux with DEBUG=true GCC does not recognize the `-mbig-obj` MinGW flag, it should only be added if DEBUG is true AND we are crosscompiling. --- source/modules/juce_audio_processors/Makefile | 8 ++++---- source/modules/juce_gui_basics/Makefile | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/source/modules/juce_audio_processors/Makefile b/source/modules/juce_audio_processors/Makefile index 0c35cda8d..736ae6cc9 100644 --- a/source/modules/juce_audio_processors/Makefile +++ b/source/modules/juce_audio_processors/Makefile @@ -12,10 +12,6 @@ include ../Makefile.mk BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I$(CWD)/includes/vst3sdk -I.. -# needed for bloated juce -ifeq ($(DEBUG),true) -BUILD_CXX_FLAGS += -Wa,-mbig-obj -endif # needed by vst3 ifeq ($(DEBUG),true) @@ -27,6 +23,10 @@ endif # needed by vst3 on mingw ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive -Wno-unknown-pragmas +# needed for bloated juce +ifeq ($(DEBUG),true) +BUILD_CXX_FLAGS += -Wa,-mbig-obj +endif endif # --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_gui_basics/Makefile b/source/modules/juce_gui_basics/Makefile index 18c357ea9..f935aadea 100644 --- a/source/modules/juce_gui_basics/Makefile +++ b/source/modules/juce_gui_basics/Makefile @@ -12,14 +12,13 @@ include ../Makefile.mk BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. +# needed for mingw juce +ifeq ($(WIN32),true) +BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-multichar # needed for bloated juce ifeq ($(DEBUG),true) BUILD_CXX_FLAGS += -Wa,-mbig-obj endif - -# needed for mingw juce -ifeq ($(WIN32),true) -BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-multichar endif # ---------------------------------------------------------------------------------------------------------------------