Browse Source

Build DGL with a custom namespace, and custom Obj-C interface names

tags/1.9.8
falkTX 8 years ago
parent
commit
9f4fd116ab
2 changed files with 5 additions and 2 deletions
  1. +3
    -0
      source/modules/dgl/src/pugl/pugl_osx.m
  2. +2
    -2
      source/native-plugins/external/Makefile.mk

+ 3
- 0
source/modules/dgl/src/pugl/pugl_osx.m View File

@@ -24,6 +24,9 @@

#include "pugl_internal.h"

#define PuglWindow PuglWindow ## DGL_NAMESPACE
#define PuglOpenGLView PuglOpenGLView ## DGL_NAMESPACE

@interface PuglWindow : NSWindow
{
@public


+ 2
- 2
source/native-plugins/external/Makefile.mk View File

@@ -78,7 +78,7 @@ DGL_LIBS = -lopengl32 -lgdi32
endif
else

DGL_FLAGS = $(shell pkg-config --cflags gl x11)
DGL_FLAGS = $(shell pkg-config --cflags gl x11) -DDGL_NAMESPACE=CarlaDGL
DGL_LIBS = $(shell pkg-config --libs gl x11)
endif
endif
@@ -96,7 +96,7 @@ endif
DPF_FLAGS = -I$(CWDE)/modules/distrho

ifeq ($(HAVE_DGL),true)
DPF_FLAGS += -I$(CWDE)/modules/dgl
DPF_FLAGS += -I$(CWDE)/modules/dgl -DDGL_NAMESPACE=CarlaDGL
endif

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


Loading…
Cancel
Save