From 6de5fc3285b40e108c23ea246e77812366090feb Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 20 May 2018 11:28:37 +0200 Subject: Fix pugl namespace under macOS Closes #34 --- dgl/src/Window.cpp | 2 ++ dgl/src/pugl/pugl_osx.m | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp index cb848067..65da2d99 100644 --- a/dgl/src/Window.cpp +++ b/dgl/src/Window.cpp @@ -33,6 +33,8 @@ #if defined(DISTRHO_OS_WINDOWS) # include "pugl/pugl_win.cpp" #elif defined(DISTRHO_OS_MAC) +# define PuglWindow DISTRHO_JOIN_MACRO(PuglWindow, DGL_NAMESPACE) +# define PuglOpenGLView DISTRHO_JOIN_MACRO(PuglOpenGLView, DGL_NAMESPACE) # include "pugl/pugl_osx.m" #else # include diff --git a/dgl/src/pugl/pugl_osx.m b/dgl/src/pugl/pugl_osx.m index fb848791..02c63012 100644 --- a/dgl/src/pugl/pugl_osx.m +++ b/dgl/src/pugl/pugl_osx.m @@ -24,9 +24,6 @@ #include "pugl_internal.h" -#define PuglWindow PuglWindow ## DGL_NAMESPACE -#define PuglOpenGLView PuglOpenGLView ## DGL_NAMESPACE - @interface PuglWindow : NSWindow { @public -- cgit v1.2.3