More tweaks to DGL namespace and MacOS builds

data/macos/build.sh

@@ -11,36 +11,35 @@ fi
 TARGETDIR=$HOME/builds
 
 export MACOS="true"
+export MACOS_OLD="true"
 export CC=clang
 export CXX=clang++
-export DEFAULT_QT=5
-export PYUIC5=$TARGETDIR/carla/bin/pyuic5
 
 unset CPPFLAGS
 
 ##############################################################################################
 # Complete 64bit build
 
-export CFLAGS="-O2 -m64 -DHAVE_CPP11_SUPPORT=0"
+export CFLAGS="-O2 -m64"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m64"
 
 export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
-make HAVE_ZYN_DEPS=false HAVE_HYLIA=false $JOBS
+make HAVE_QT5=true $JOBS
 
 ##############################################################################################
 # Build 32bit bridges
 
-export CFLAGS="-O2 -m32 -DHAVE_CPP11_SUPPORT=0"
+export CFLAGS="-O2 -m32"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m32"
 
 export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
 
-make HAVE_ZYN_DEPS=false HAVE_HYLIA=false posix32 $JOBS
+make HAVE_QT5=true posix32 $JOBS
 
 ##############################################################################################
 # Build Mac App

source/modules/distrho/DistrhoUI.hpp

@@ -25,10 +25,10 @@
 typedef DISTRHO_NAMESPACE::ExternalWindow UIWidget;
 #elif DISTRHO_UI_USE_NANOVG
 # include "../dgl/NanoVG.hpp"
-typedef DGL::NanoWidget UIWidget;
+typedef DGL_NAMESPACE::NanoWidget UIWidget;
 #else
 # include "../dgl/Widget.hpp"
-typedef DGL::Widget UIWidget;
+typedef DGL_NAMESPACE::Widget UIWidget;
 #endif
 
 START_NAMESPACE_DISTRHO
@@ -212,7 +212,7 @@ private:
     void setAbsoluteX(int) const noexcept {}
     void setAbsoluteY(int) const noexcept {}
     void setAbsolutePos(int, int) const noexcept {}
-    void setAbsolutePos(const DGL::Point<int>&) const noexcept {}
+    void setAbsolutePos(const DGL_NAMESPACE::Point<int>&) const noexcept {}
 #endif
 
     DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI)

source/modules/distrho/src/DistrhoUIInternal.hpp

@@ -22,9 +22,9 @@
 #ifdef HAVE_DGL
 # include "../../dgl/Application.hpp"
 # include "../../dgl/Window.hpp"
-using DGL::Application;
-using DGL::IdleCallback;
-using DGL::Window;
+using DGL_NAMESPACE::Application;
+using DGL_NAMESPACE::IdleCallback;
+using DGL_NAMESPACE::Window;
 #endif
 
 START_NAMESPACE_DISTRHO

source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp

@@ -17,8 +17,6 @@
 #include "DistrhoPlugin3BandSplitter.hpp"
 #include "DistrhoUI3BandSplitter.hpp"
 
-using DGL::Point;
-
 START_NAMESPACE_DISTRHO
 
 namespace Art = DistrhoArtwork3BandSplitter;

source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp

@@ -25,10 +25,10 @@
 #include "DistrhoArtworkNekobi.hpp"
 #include "NekoWidget.hpp"
 
-using DGL::ImageAboutWindow;
-using DGL::ImageButton;
-using DGL::ImageKnob;
-using DGL::ImageSlider;
+using DGL_NAMESPACE::ImageAboutWindow;
+using DGL_NAMESPACE::ImageButton;
+using DGL_NAMESPACE::ImageKnob;
+using DGL_NAMESPACE::ImageSlider;
 
 START_NAMESPACE_DISTRHO
 

source/native-plugins/distrho-nekobi/NekoWidget.hpp

@@ -25,7 +25,7 @@
 
 #include <cstdlib> // rand
 
-using DGL::Image;
+using DGL_NAMESPACE::Image;
 
 // -----------------------------------------------------------------------
 

source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp

@@ -18,7 +18,7 @@
 #include "VectorJuicePlugin.hpp"
 #include "VectorJuiceUI.hpp"
 
-using DGL::Point;
+using DGL_NAMESPACE::Point;
 
 START_NAMESPACE_DISTRHO
 

source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp

@@ -24,11 +24,11 @@
 
 #include "VectorJuiceArtwork.hpp"
 
-using DGL::Image;
-using DGL::ImageAboutWindow;
-using DGL::ImageButton;
-using DGL::ImageKnob;
-using DGL::ImageSlider;
+using DGL_NAMESPACE::Image;
+using DGL_NAMESPACE::ImageAboutWindow;
+using DGL_NAMESPACE::ImageButton;
+using DGL_NAMESPACE::ImageKnob;
+using DGL_NAMESPACE::ImageSlider;
 
 START_NAMESPACE_DISTRHO
 
@@ -88,7 +88,7 @@ private:
     bool fDragValid;
     int  fLastX;
     int  fLastY;
-    DGL::Rectangle<int> fCanvasArea;
+    DGL_NAMESPACE::Rectangle<int> fCanvasArea;
     float orbitX, orbitY, subOrbitX, subOrbitY;
 };
 

source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp

@@ -24,10 +24,10 @@
 
 #include "WobbleJuiceArtwork.hpp"
 
-using DGL::Image;
-using DGL::ImageAboutWindow;
-using DGL::ImageButton;
-using DGL::ImageKnob;
+using DGL_NAMESPACE::Image;
+using DGL_NAMESPACE::ImageAboutWindow;
+using DGL_NAMESPACE::ImageButton;
+using DGL_NAMESPACE::ImageKnob;
 
 START_NAMESPACE_DISTRHO
 

source/theme/CarlaStyle.hpp

@@ -25,14 +25,6 @@
 
 #include <QtCore/Qt>
 
-#ifdef CARLA_OS_MAC
-# undef Q_COMPILER_UNICODE_STRINGS
-# undef Q_DECL_CONSTEXPR
-# undef Q_DECL_NOEXCEPT_EXPR
-# define Q_DECL_CONSTEXPR
-# define Q_DECL_NOEXCEPT_EXPR(x)
-#endif
-
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 # include <QtWidgets/QCommonStyle>
 #else