diff --git a/Makefile b/Makefile
index e74e63bb7..785b642a8 100644
--- a/Makefile
+++ b/Makefile
@@ -262,6 +262,7 @@ RES = \
 	bin/resources/carla_config.py \
 	bin/resources/carla_database.py \
 	bin/resources/carla_host.py \
+	bin/resources/carla_panels.py \
 	bin/resources/carla_settings.py \
 	bin/resources/carla_skin.py \
 	bin/resources/carla_shared.py \
diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh
index 834db82f5..c969519c0 100755
--- a/data/macos/build-deps.sh
+++ b/data/macos/build-deps.sh
@@ -305,6 +305,7 @@ cd glib-2.42.0
 chmod +x configure install-sh
 env CFLAGS="$CFLAGS -I$PREFIX/include" LDFLAGS="$LDFLAGS -L$PREFIX/lib" PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
 env PATH=/opt/local/bin:$PATH make
+sudo touch /opt/carla64/bin/gtester-report
 sudo make install
 touch build-done
 cd ..
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 6240c1262..c8abb88a2 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -286,7 +286,7 @@ FLUIDSYNTH_LIBS  = $(shell pkg-config --libs fluidsynth)
 endif
 
 ifeq ($(HAVE_LINUXSAMPLER),true)
-LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -Wno-unused-parameter
+LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -DIS_CPP11=1 -Wno-non-virtual-dtor -Wno-shadow -Wno-unused-parameter
 LINUXSAMPLER_LIBS  = $(shell pkg-config --libs linuxsampler)
 endif
 
diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp
index f3abb0572..b921fe865 100644
--- a/source/backend/plugin/NativePlugin.cpp
+++ b/source/backend/plugin/NativePlugin.cpp
@@ -1632,7 +1632,9 @@ public:
 
                     if (midiEvent.size > 4)
                         continue;
+#ifdef CARLA_PROPER_CPP11_SUPPORT
                     static_assert(4 <= EngineMidiEvent::kDataSize, "Incorrect data");
+#endif
 
                     uint8_t status = uint8_t(MIDI_GET_STATUS_FROM_DATA(midiEvent.data));
 
diff --git a/source/bridges-ui/Makefile b/source/bridges-ui/Makefile
index ed8b4d214..69bab8da6 100644
--- a/source/bridges-ui/Makefile
+++ b/source/bridges-ui/Makefile
@@ -72,11 +72,13 @@ TARGETS += ui_vst-x11
 endif
 
 ifeq ($(MACOS),true)
-TARGETS += ui_lv2-cocoa
+# TODO
+# TARGETS += ui_lv2-cocoa
 endif
 
 ifeq ($(WIN32),true)
-TARGETS += ui_lv2-windows
+# TODO
+# TARGETS += ui_lv2-windows
 endif
 
 # --------------------------------------------------------------
diff --git a/source/modules/juce_audio_processors/Makefile b/source/modules/juce_audio_processors/Makefile
index c476fba08..6ed9dd43e 100644
--- a/source/modules/juce_audio_processors/Makefile
+++ b/source/modules/juce_audio_processors/Makefile
@@ -14,12 +14,15 @@ ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 else
 # needed by vst3
-BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive
 ifeq ($(DEBUG),true)
 BUILD_CXX_FLAGS += -DDEVELOPMENT -D_DEBUG
 else
 BUILD_CXX_FLAGS += -DRELEASE
 endif
+# needed by vst3 on mingw
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive
+endif
 endif
 
 # --------------------------------------------------------------
diff --git a/source/utils/CarlaVstUtils.hpp b/source/utils/CarlaVstUtils.hpp
index 8e0f17155..1faad843d 100644
--- a/source/utils/CarlaVstUtils.hpp
+++ b/source/utils/CarlaVstUtils.hpp
@@ -118,7 +118,10 @@ struct ERect {
     int16_t top, left, bottom, right;
 };
 #else
-#ifndef CARLA_OS_MAC
+#ifdef CARLA_OS_MAC
+# undef __ppc__
+# define __ppc__ 0
+#else
 # undef TARGET_API_MAC_CARBON
 # define TARGET_API_MAC_CARBON 0
 #endif