Browse Source

Fix build, closes #253

tags/1.9.7
falkTX 10 years ago
parent
commit
38fb19447f
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      source/native-plugins/Makefile
  2. +1
    -1
      source/native-plugins/zynaddsubfx/UI/MasterUI.fl

+ 4
- 0
source/native-plugins/Makefile View File

@@ -20,6 +20,10 @@ ifeq ($(HAVE_ZYN_DEPS),true)
ZYN_CXX_FLAGS = $(BUILD_CXX_FLAGS) -isystem zynaddsubfx -Izynaddsubfx/rtosc
ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib)
ZYN_LD_FLAGS = $(shell pkg-config --libs liblo)
ifeq ($(HAVE_X11),true)
ZYN_CXX_FLAGS += $(shell pkg-config --cflags x11)
ZYN_LD_FLAGS += $(shell pkg-config --libs x11)
endif
ifeq ($(HAVE_ZYN_UI_DEPS),true)
ifeq ($(HAVE_NTK),true)
FLUID = ntk-fluid


+ 1
- 1
source/native-plugins/zynaddsubfx/UI/MasterUI.fl View File

@@ -1495,7 +1495,7 @@ configui=new ConfigUI(osc);
make_window();
fl_open_display();

\#ifndef __APPLE__
\#ifdef HAVE_X11
Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
(char*)zynaddsubfx_bits, zynaddsubfx_width, zynaddsubfx_height);
masterwindow->icon((char *)p);


Loading…
Cancel
Save