Browse Source

WANT_LILV build macro for carla-discovery

tags/v0.9.0
falkTX 13 years ago
parent
commit
8f40a8d245
2 changed files with 13 additions and 0 deletions
  1. +6
    -0
      src/carla-discovery/Makefile
  2. +7
    -0
      src/carla-discovery/carla-discovery.cpp

+ 6
- 0
src/carla-discovery/Makefile View File

@@ -35,6 +35,12 @@ BUILD_FLAGS += `pkg-config --cflags fluidsynth` -DWANT_FLUIDSYNTH
LINK_FLAGS += `pkg-config --libs fluidsynth` LINK_FLAGS += `pkg-config --libs fluidsynth`
endif endif


ifeq ($(LILV),)
else
BUILD_FLAGS += -DWANT_LILV
LINK_FLAGS += ../carla-lilv/carla_lilv.a
endif



all: all:
@echo "Build type must be unix32, unix64, win[e]32 or win[e]64" @echo "Build type must be unix32, unix64, win[e]32 or win[e]64"


+ 7
- 0
src/carla-discovery/carla-discovery.cpp View File

@@ -42,11 +42,13 @@
#include "ladspa/ladspa.h" #include "ladspa/ladspa.h"
#include "dssi/dssi.h" #include "dssi/dssi.h"


#ifdef WANT_LILV
#include "lv2/atom.h" #include "lv2/atom.h"
#include "lv2/event.h" #include "lv2/event.h"
#include "lv2/midi.h" #include "lv2/midi.h"
#include "lilv/lilvmm.hpp" #include "lilv/lilvmm.hpp"
#define LV2_MIDI_LL__MidiPort "http://ll-plugins.nongnu.org/lv2/ext/MidiPort" #define LV2_MIDI_LL__MidiPort "http://ll-plugins.nongnu.org/lv2/ext/MidiPort"
#endif


#define VST_FORCE_DEPRECATED 0 #define VST_FORCE_DEPRECATED 0
#include "aeffectx.h" #include "aeffectx.h"
@@ -765,6 +767,7 @@ void do_dssi_check(void* lib_handle)


void do_lv2_check(const char* bundle) void do_lv2_check(const char* bundle)
{ {
#ifdef WANT_LILV
std::string sbundle; std::string sbundle;
sbundle += "file://"; sbundle += "file://";
sbundle += bundle; sbundle += bundle;
@@ -900,6 +903,10 @@ void do_lv2_check(const char* bundle)
DISCOVERY_OUT("build", BINARY_TYPE); DISCOVERY_OUT("build", BINARY_TYPE);
DISCOVERY_OUT("end", "------------"); DISCOVERY_OUT("end", "------------");
} }
#else
(void)bundle;
DISCOVERY_OUT("error", "LV2 support not available");
#endif
} }


void do_vst_check(void* lib_handle) void do_vst_check(void* lib_handle)


Loading…
Cancel
Save