From f1d7d4de68e8a94c1d306f92e83fd378bd54db76 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Aug 2014 16:21:35 +0100 Subject: [PATCH] Fix discovery always having gig,sf2,sfz support disabled --- source/discovery/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/discovery/Makefile b/source/discovery/Makefile index aa511e26a..04e3506ba 100644 --- a/source/discovery/Makefile +++ b/source/discovery/Makefile @@ -5,7 +5,8 @@ # CWD=.. -include ../Makefile.mk +include $(CWD)/Makefile.deps +include $(CWD)/Makefile.mk # -------------------------------------------------------------- @@ -18,6 +19,9 @@ ifeq ($(MACOS),true) BUILD_CXX_FLAGS += -ObjC++ endif +32BIT_FLAGS += -DBUILD_BRIDGE +64BIT_FLAGS += -DBUILD_BRIDGE + # -------------------------------------------------------------- ifeq ($(CARLA_VESTIGE_HEADER),true) @@ -94,7 +98,7 @@ LIBS += ../modules/juce_gui_extra.a LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) endif -POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DBUILD_BRIDGE +POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS) POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu POSIX_LINK_FLAGS = $(LINK_FLAGS) @@ -103,7 +107,7 @@ ifneq ($(HAIKU),true) POSIX_LINK_FLAGS += -ldl endif -WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DBUILD_BRIDGE +WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) WIN_LINK_FLAGS = $(LINK_FLAGS) $(EXTRA_LIBS)