Browse Source

Fix previous commit; Enable cairo in CI Linux builds

pull/178/head
falkTX 4 years ago
parent
commit
b24777bce0
Signed by: falkTX <falktx@gmail.com> GPG Key ID: 2D3445A829213837
4 changed files with 12 additions and 11 deletions
  1. +1
    -0
      .travis/install.sh
  2. +1
    -1
      .travis/script-win32.sh
  3. +1
    -1
      .travis/script-win64.sh
  4. +9
    -9
      dgl/src/Window.cpp

+ 1
- 0
.travis/install.sh View File

@@ -5,6 +5,7 @@ set -e
sudo apt-get install -y \
g++ \
pkg-config \
libcairo2-dev \
libjack-jackd2-dev \
liblo-dev \
libgl1-mesa-dev \


+ 1
- 1
.travis/script-win32.sh View File

@@ -17,4 +17,4 @@ export CROSS_COMPILING=true
make clean >/dev/null

# Build now
make
make HAVE_CAIRO=false HAVE_JACK=false

+ 1
- 1
.travis/script-win64.sh View File

@@ -17,4 +17,4 @@ export CROSS_COMPILING=true
make clean >/dev/null

# Build now
make
make HAVE_CAIRO=false HAVE_JACK=false

+ 9
- 9
dgl/src/Window.cpp View File

@@ -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)


Loading…
Cancel
Save