Browse Source

Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
851c89ec07
3 changed files with 10 additions and 7 deletions
  1. +4
    -3
      source/bridges/Makefile
  2. +2
    -0
      source/discovery/Makefile
  3. +4
    -4
      source/discovery/carla-discovery.cpp

+ 4
- 3
source/bridges/Makefile View File

@@ -41,8 +41,8 @@ BUILD_PLUGIN_FLAGS += $(shell pkg-config --cflags gl)
LINK_PLUGIN_FLAGS = $(LINK_FLAGS) LINK_PLUGIN_FLAGS = $(LINK_FLAGS)
LINK_PLUGIN_FLAGS += $(shell pkg-config --libs gl) LINK_PLUGIN_FLAGS += $(shell pkg-config --libs gl)


NATIVE_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack) -DWANT_NATIVE
NATIVE_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl
NATIVE_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack QtGui) -DWANT_NATIVE
NATIVE_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack QtGui) -ldl


ifeq ($(HAVE_AF_DEPS),true) ifeq ($(HAVE_AF_DEPS),true)
NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE
@@ -279,7 +279,8 @@ OBJS_NATIVE += \
../backend/libcarla_native.a \ ../backend/libcarla_native.a \
../libs/dgl.a \ ../libs/dgl.a \
../libs/lilv.a \ ../libs/lilv.a \
../libs/rtmempool.a
../libs/rtmempool.a \
../libs/widgets.a


carla-bridge-native: $(OBJS_NATIVE) carla-bridge-native: $(OBJS_NATIVE)
$(CXX) $^ $(NATIVE_LINK_FLAGS) -o $@ && $(STRIP) $@ $(CXX) $^ $(NATIVE_LINK_FLAGS) -o $@ && $(STRIP) $@


+ 2
- 0
source/discovery/Makefile View File

@@ -9,6 +9,8 @@ include ../Makefile.mk
# -------------------------------------------------------------- # --------------------------------------------------------------


BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
LINK_FLAGS += $(shell pkg-config --libs QtCore)


ifeq ($(CARLA_PLUGIN_SUPPORT),true) ifeq ($(CARLA_PLUGIN_SUPPORT),true)
BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST


+ 4
- 4
source/discovery/carla-discovery.cpp View File

@@ -16,10 +16,10 @@
*/ */


#include "CarlaBackendUtils.hpp" #include "CarlaBackendUtils.hpp"
//#include "CarlaJuceUtils.hpp"
//#include "CarlaLibUtils.hpp"
//#include "CarlaString.hpp"
//#include "CarlaMIDI.h"
#include "CarlaJuceUtils.hpp"
#include "CarlaLibUtils.hpp"
#include "CarlaString.hpp"
#include "CarlaMIDI.h"


#ifdef WANT_LADSPA #ifdef WANT_LADSPA
# include "CarlaLadspaUtils.hpp" # include "CarlaLadspaUtils.hpp"


Loading…
Cancel
Save