Build carla with a custom namespace
This commit is contained in:
parent
b7d4847e19
commit
1260ca840f
6 changed files with 6 additions and 7 deletions
2
Makefile
2
Makefile
|
@ -43,7 +43,7 @@ endif
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# Carla config
|
# Carla config
|
||||||
|
|
||||||
CARLA_EXTRA_ARGS = \
|
CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Cardinal \
|
||||||
HAVE_FFMPEG=false \
|
HAVE_FFMPEG=false \
|
||||||
HAVE_FLUIDSYNTH=false \
|
HAVE_FLUIDSYNTH=false \
|
||||||
HAVE_PROJECTM=false \
|
HAVE_PROJECTM=false \
|
||||||
|
|
2
carla
2
carla
|
@ -1 +1 @@
|
||||||
Subproject commit 719246eb66462986c0702480f2d0cc1bef448eb8
|
Subproject commit 1f5e44c4bb4926298e4a9d666436671f2d12e5ff
|
|
@ -38,7 +38,7 @@ const NativePluginDescriptor* carla_getNativePluginDescriptor(const std::size_t
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
using namespace CarlaBackend;
|
using namespace CARLA_BACKEND_NAMESPACE;
|
||||||
|
|
||||||
static uint32_t host_get_buffer_size(NativeHostHandle);
|
static uint32_t host_get_buffer_size(NativeHostHandle);
|
||||||
static double host_get_sample_rate(NativeHostHandle);
|
static double host_get_sample_rate(NativeHostHandle);
|
||||||
|
|
|
@ -39,7 +39,7 @@ json_t *jsonp_stringn_nocheck_own(const char* value, size_t len);
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
using namespace CarlaBackend;
|
using namespace CARLA_BACKEND_NAMESPACE;
|
||||||
|
|
||||||
static uint32_t host_get_buffer_size(NativeHostHandle);
|
static uint32_t host_get_buffer_size(NativeHostHandle);
|
||||||
static double host_get_sample_rate(NativeHostHandle);
|
static double host_get_sample_rate(NativeHostHandle);
|
||||||
|
|
|
@ -77,9 +77,7 @@ namespace ildaeil {
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------------------------------------
|
using namespace CARLA_BACKEND_NAMESPACE;
|
||||||
|
|
||||||
using namespace CarlaBackend;
|
|
||||||
|
|
||||||
static uint32_t host_get_buffer_size(NativeHostHandle);
|
static uint32_t host_get_buffer_size(NativeHostHandle);
|
||||||
static double host_get_sample_rate(NativeHostHandle);
|
static double host_get_sample_rate(NativeHostHandle);
|
||||||
|
|
|
@ -1017,6 +1017,7 @@ $(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp
|
||||||
-Dstbtt_fontinfo=stbtt_fontinfo_cardinal \
|
-Dstbtt_fontinfo=stbtt_fontinfo_cardinal \
|
||||||
-Dstbrp_node=stbrp_node_cardinal \
|
-Dstbrp_node=stbrp_node_cardinal \
|
||||||
-Dstbrp_rect=stbrp_rect_cardinal \
|
-Dstbrp_rect=stbrp_rect_cardinal \
|
||||||
|
-DCARLA_BACKEND_NAMESPACE=Cardinal \
|
||||||
-DREAL_BUILD \
|
-DREAL_BUILD \
|
||||||
-DSTATIC_PLUGIN_TARGET \
|
-DSTATIC_PLUGIN_TARGET \
|
||||||
-I../carla/source/backend \
|
-I../carla/source/backend \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue