Browse Source

Revert 60aaad33f8e474ca0c269a5913f8d33f7f9b6bb6, carla builds again

tags/1.9.7
falkTX 11 years ago
parent
commit
d0882ce0ac
1 changed files with 2 additions and 12 deletions
  1. +2
    -12
      source/Makefile.mk

+ 2
- 12
source/Makefile.mk View File

@@ -414,23 +414,13 @@ endif

ifeq ($(EXPERIMENTAL_PLUGINS),true)
BASE_FLAGS += -DHAVE_EXPERIMENTAL_PLUGINS
# Prefer static libs of the next libs
NATIVE_PLUGINS_LIBS += -Wl,-Bstatic
NATIVE_PLUGINS_LIBS += -lclxclient -lclthreads -lzita-convolver -lzita-resampler
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs libpng12 fftw3f)
# Back to normal
NATIVE_PLUGINS_LIBS += -Wl,-Bdynamic
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs cairo x11 xft)
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs cairo libpng12 fftw3f x11 xft)
endif

ifeq ($(HAVE_ZYN_DEPS),true)
BASE_FLAGS += -DHAVE_ZYN_DEPS
# Prefer fftw3 as static lib
NATIVE_PLUGINS_LIBS += -Wl,-Bstatic
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs fftw3)
# Back to normal
NATIVE_PLUGINS_LIBS += -Wl,-Bdynamic
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs mxml zlib)
NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs fftw3 mxml zlib)
ifeq ($(HAVE_ZYN_UI_DEPS),true)
BASE_FLAGS += -DHAVE_ZYN_UI_DEPS
ifeq ($(HAVE_NTK),true)


Loading…
Cancel
Save