DPF

commit b24777bce01d1c1d01fdb8b16e2a4892b2f88120
parent 14b4536aad5651cf8586882090382d0b66b3504b
Author: falkTX <falktx@gmail.com>
Date:   Sat, 17 Aug 2019 22:36:16 +0100

Fix previous commit; Enable cairo in CI Linux builds

Diffstat:
M
.travis/install.sh
 | 
1
+
M
.travis/script-win32.sh
 | 
2
+-
M
.travis/script-win64.sh
 | 
2
+-
M
dgl/src/Window.cpp
 | 
18
+++++++++---------

4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -5,6 +5,7 @@ set -e
 sudo apt-get install -y \
     g++ \
     pkg-config \
+    libcairo2-dev \
     libjack-jackd2-dev \
     liblo-dev \
     libgl1-mesa-dev \
diff --git a/.travis/script-win32.sh b/.travis/script-win32.sh
@@ -17,4 +17,4 @@ export CROSS_COMPILING=true
 make clean >/dev/null
 
 # Build now
-make
+make HAVE_CAIRO=false HAVE_JACK=false
diff --git a/.travis/script-win64.sh b/.travis/script-win64.sh
@@ -17,4 +17,4 @@ export CROSS_COMPILING=true
 make clean >/dev/null
 
 # Build now
-make
+make HAVE_CAIRO=false HAVE_JACK=false
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
@@ -108,13 +108,13 @@ struct Window::PrivateData {
           mView(nullptr),
           mWindow(nullptr),
           mParentWindow(nullptr)
-#elif defined(DISTRHO_OS_WINDOWS)
-          hwnd(nullptr),
-          hwndParent(nullptr)
 # ifndef DGL_FILE_BROWSER_DISABLED
         , fOpenFilePanel(nullptr),
           fFilePanelDelegate(nullptr)
 # endif
+#elif defined(DISTRHO_OS_WINDOWS)
+          hwnd(nullptr),
+          hwndParent(nullptr)
 #else
           xDisplay(nullptr),
           xWindow(0)
@@ -146,13 +146,13 @@ struct Window::PrivateData {
           mView(nullptr),
           mWindow(nullptr),
           mParentWindow(nullptr)
-#elif defined(DISTRHO_OS_WINDOWS)
-          hwnd(nullptr),
-          hwndParent(nullptr)
 # ifndef DGL_FILE_BROWSER_DISABLED
         , fOpenFilePanel(nullptr),
           fFilePanelDelegate(nullptr)
 # endif
+#elif defined(DISTRHO_OS_WINDOWS)
+          hwnd(nullptr),
+          hwndParent(nullptr)
 #else
           xDisplay(nullptr),
           xWindow(0)
@@ -198,13 +198,13 @@ struct Window::PrivateData {
           mView(nullptr),
           mWindow(nullptr),
           mParentWindow(nullptr)
-#elif defined(DISTRHO_OS_WINDOWS)
-          hwnd(nullptr),
-          hwndParent(nullptr)
 # ifndef DGL_FILE_BROWSER_DISABLED
         , fOpenFilePanel(nullptr),
           fFilePanelDelegate(nullptr)
 # endif
+#elif defined(DISTRHO_OS_WINDOWS)
+          hwnd(nullptr),
+          hwndParent(nullptr)
 #else
           xDisplay(nullptr),
           xWindow(0)