Browse Source

Fix build with custom DGL namespace

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 1 year ago
parent
commit
cf11562c50
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 4 additions and 5 deletions
  1. +3
    -2
      source/Makefile.mk
  2. +1
    -3
      source/plugin/Makefile

+ 3
- 2
source/Makefile.mk View File

@@ -176,14 +176,15 @@ BASE_FLAGS += -DHAVE_OPENGL
BASE_FLAGS += -DDGL_OPENGL BASE_FLAGS += -DDGL_OPENGL
BASE_FLAGS += -DDONT_SET_USING_DGL_NAMESPACE BASE_FLAGS += -DDONT_SET_USING_DGL_NAMESPACE
ifneq ($(USING_CUSTOM_DPF),true) ifneq ($(USING_CUSTOM_DPF),true)
BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
BASE_FLAGS += -DDGL_FILE_BROWSER_DISABLED BASE_FLAGS += -DDGL_FILE_BROWSER_DISABLED
BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES
else else
BASE_FLAGS += -DDISTRHO_UI_FILE_BROWSER=0 BASE_FLAGS += -DDISTRHO_UI_FILE_BROWSER=0
endif
ifneq ($(DGL_NAMESPACE),) ifneq ($(DGL_NAMESPACE),)
BASE_FLAGS += -DDGL_NAMESPACE=$(DGL_NAMESPACE) BASE_FLAGS += -DDGL_NAMESPACE=$(DGL_NAMESPACE)
endif
else
BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
endif endif
endif endif




+ 1
- 3
source/plugin/Makefile View File

@@ -77,9 +77,7 @@ LIBS += $(MODULEDIR)/sfzero.a
LIBS += $(MODULEDIR)/zita-resampler.a LIBS += $(MODULEDIR)/zita-resampler.a


ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_DGL),true)
ifeq ($(STATIC_PLUGIN_TARGET)$(USING_CUSTOM_DPF),truetrue)
# nothing
else ifeq ($(USING_CUSTOM_DPF),true)
ifeq ($(USING_CUSTOM_DPF),true)
LIBS += $(CUSTOM_DPF_PATH)/build/libdgl-opengl.a LIBS += $(CUSTOM_DPF_PATH)/build/libdgl-opengl.a
else else
LIBS += $(MODULEDIR)/dgl.a LIBS += $(MODULEDIR)/dgl.a


Loading…
Cancel
Save