Browse Source

Set custom DISTRHO and DGL namespace

Closes #271

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.07
falkTX 2 years ago
parent
commit
e79038812b
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
9 changed files with 22 additions and 5 deletions
  1. +5
    -2
      Makefile
  2. +1
    -1
      carla
  3. +2
    -0
      deps/Makefile
  4. +1
    -1
      dpf
  5. +6
    -0
      jucewrapper/CMakeLists.txt
  6. +1
    -1
      lv2export/Makefile
  7. +2
    -0
      plugins/Makefile
  8. +2
    -0
      src/Makefile
  9. +2
    -0
      src/Makefile.cardinal.mk

+ 5
- 2
Makefile View File

@@ -12,7 +12,6 @@ VERSION = 22.06
# --------------------------------------------------------------
# Import base definitions

USE_NANOVG_FBO = true
include dpf/Makefile.base.mk

# --------------------------------------------------------------
@@ -43,7 +42,9 @@ endif
# --------------------------------------------------------------
# Carla config

CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Cardinal \
CARLA_EXTRA_ARGS = \
CARLA_BACKEND_NAMESPACE=Cardinal \
DGL_NAMESPACE=CardinalDGL \
HAVE_FFMPEG=false \
HAVE_FLUIDSYNTH=false \
HAVE_PROJECTM=false \
@@ -58,6 +59,8 @@ endif
# DGL config

DGL_EXTRA_ARGS = \
DISTRHO_NAMESPACE=CardinalDISTRHO \
DGL_NAMESPACE=CardinalDGL \
NVG_DISABLE_SKIPPING_WHITESPACE=true \
NVG_FONT_TEXTURE_FLAGS=NVG_IMAGE_NEAREST \
USE_NANOVG_FBO=true \


+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit f428af3894a5916aee281fa682f4a938f8e67f0b
Subproject commit 770364fd8e684d08aa08f74d88c6d8cb41f77c21

+ 2
- 0
deps/Makefile View File

@@ -7,6 +7,8 @@
# --------------------------------------------------------------
# Import base definitions

DISTRHO_NAMESPACE = CardinalDISTRHO
DGL_NAMESPACE = CardinalDGL
USE_NANOVG_FBO = true
include ../dpf/Makefile.base.mk



+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 38dad9fdfd75e0887a31abb9bfe7acff88cfd85b
Subproject commit 194f04aee8396c98f320052626603d77a1b1931e

+ 6
- 0
jucewrapper/CMakeLists.txt View File

@@ -143,6 +143,8 @@ target_include_directories(Cardinal

target_compile_definitions(Cardinal
PUBLIC
DISTRHO_NAMESPACE=CardinalDISTRHO
DGL_NAMESPACE=CardinalDGL
JucePlugin_PreferredChannelConfigurations=8,8
JUCE_CHECK_MEMORY_LEAKS=0
JUCE_DISABLE_NATIVE_FILECHOOSERS=1
@@ -234,6 +236,8 @@ target_include_directories(CardinalFX

target_compile_definitions(CardinalFX
PUBLIC
DISTRHO_NAMESPACE=CardinalDISTRHO
DGL_NAMESPACE=CardinalDGL
JucePlugin_PreferredChannelConfigurations=2,2
JUCE_CHECK_MEMORY_LEAKS=0
JUCE_DISABLE_NATIVE_FILECHOOSERS=1
@@ -324,6 +328,8 @@ target_include_directories(CardinalSynth

target_compile_definitions(CardinalSynth
PUBLIC
DISTRHO_NAMESPACE=CardinalDISTRHO
DGL_NAMESPACE=CardinalDGL
JucePlugin_PreferredChannelConfigurations=0,2
JUCE_CHECK_MEMORY_LEAKS=0
JUCE_DISABLE_NATIVE_FILECHOOSERS=1


+ 1
- 1
lv2export/Makefile View File

@@ -14,7 +14,7 @@ SYSDEPS ?= false
# --------------------------------------------------------------
# Import base definitions

USE_NANOVG_FBO = true
DISTRHO_NAMESPACE = CardinalLV2
include ../dpf/Makefile.base.mk

# --------------------------------------------------------------


+ 2
- 0
plugins/Makefile View File

@@ -7,6 +7,8 @@
# --------------------------------------------------------------
# Import base definitions

DISTRHO_NAMESPACE = CardinalDISTRHO
DGL_NAMESPACE = CardinalDGL
USE_NANOVG_FBO = true
include ../dpf/Makefile.base.mk



+ 2
- 0
src/Makefile View File

@@ -7,6 +7,8 @@
# --------------------------------------------------------------
# Import base definitions

DISTRHO_NAMESPACE = CardinalDISTRHO
DGL_NAMESPACE = CardinalDGL
USE_NANOVG_FBO = true
include ../dpf/Makefile.base.mk



+ 2
- 0
src/Makefile.cardinal.mk View File

@@ -48,6 +48,8 @@ endif # STATIC_BUILD
# --------------------------------------------------------------
# Import base definitions

DISTRHO_NAMESPACE = CardinalDISTRHO
DGL_NAMESPACE = CardinalDGL
NVG_DISABLE_SKIPPING_WHITESPACE = true
NVG_FONT_TEXTURE_FLAGS = NVG_IMAGE_NEAREST
USE_NANOVG_FBO = true


Loading…
Cancel
Save