From 5049e17d674266534ae5a9ea6d99accf47eab4e1 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 30 Nov 2017 21:32:03 +0000 Subject: [PATCH] More tweaks to DGL namespace and MacOS builds --- data/macos/build.sh | 11 +++++------ source/modules/distrho/DistrhoUI.hpp | 6 +++--- source/modules/distrho/src/DistrhoUIInternal.hpp | 6 +++--- .../distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp | 2 -- .../distrho-nekobi/DistrhoUINekobi.hpp | 8 ++++---- source/native-plugins/distrho-nekobi/NekoWidget.hpp | 2 +- .../distrho-vectorjuice/VectorJuiceUI.cpp | 2 +- .../distrho-vectorjuice/VectorJuiceUI.hpp | 12 ++++++------ .../distrho-wobblejuice/WobbleJuiceUI.hpp | 8 ++++---- source/theme/CarlaStyle.hpp | 8 -------- 10 files changed, 27 insertions(+), 38 deletions(-) diff --git a/data/macos/build.sh b/data/macos/build.sh index 628f30731..7436d21a9 100755 --- a/data/macos/build.sh +++ b/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 diff --git a/source/modules/distrho/DistrhoUI.hpp b/source/modules/distrho/DistrhoUI.hpp index da8db4145..fd6357a1e 100644 --- a/source/modules/distrho/DistrhoUI.hpp +++ b/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&) const noexcept {} + void setAbsolutePos(const DGL_NAMESPACE::Point&) const noexcept {} #endif DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI) diff --git a/source/modules/distrho/src/DistrhoUIInternal.hpp b/source/modules/distrho/src/DistrhoUIInternal.hpp index f771781ba..5c41ece3b 100644 --- a/source/modules/distrho/src/DistrhoUIInternal.hpp +++ b/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 diff --git a/source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp b/source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp index 8370684f9..2f11494dc 100644 --- a/source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp +++ b/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; diff --git a/source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp b/source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp index af34e3844..e74b855a8 100644 --- a/source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp +++ b/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 diff --git a/source/native-plugins/distrho-nekobi/NekoWidget.hpp b/source/native-plugins/distrho-nekobi/NekoWidget.hpp index 0bba0cd74..0b7775eec 100644 --- a/source/native-plugins/distrho-nekobi/NekoWidget.hpp +++ b/source/native-plugins/distrho-nekobi/NekoWidget.hpp @@ -25,7 +25,7 @@ #include // rand -using DGL::Image; +using DGL_NAMESPACE::Image; // ----------------------------------------------------------------------- diff --git a/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp b/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp index cc9c36277..69185e414 100644 --- a/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp +++ b/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 diff --git a/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp b/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp index aff9981ee..808742140 100644 --- a/source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp +++ b/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 fCanvasArea; + DGL_NAMESPACE::Rectangle fCanvasArea; float orbitX, orbitY, subOrbitX, subOrbitY; }; diff --git a/source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp b/source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp index 4b13a8612..63b7cabac 100644 --- a/source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp +++ b/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 diff --git a/source/theme/CarlaStyle.hpp b/source/theme/CarlaStyle.hpp index ecafe8945..32e617b9f 100644 --- a/source/theme/CarlaStyle.hpp +++ b/source/theme/CarlaStyle.hpp @@ -25,14 +25,6 @@ #include -#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 #else