Browse Source

Fix DGL namespace for OSX and Windows

tags/1.9.8
falkTX 7 years ago
parent
commit
ff03cc5a04
2 changed files with 7 additions and 5 deletions
  1. +1
    -1
      data/macos/build.sh
  2. +6
    -4
      source/native-plugins/external/Makefile.mk

+ 1
- 1
data/macos/build.sh View File

@@ -39,7 +39,7 @@ export LDFLAGS="-m32"
export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig

make HAVE_QT5=true posix32 $JOBS
make posix32 $JOBS

##############################################################################################
# Build Mac App


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

@@ -71,16 +71,18 @@ ifeq ($(HAVE_DGL),true)

ifeq ($(MACOS_OR_WIN32),true)
ifeq ($(MACOS),true)
DGL_LIBS = -framework OpenGL -framework Cocoa
DGL_LIBS = -framework OpenGL -framework Cocoa
endif
ifeq ($(WIN32),true)
DGL_LIBS = -lopengl32 -lgdi32
DGL_LIBS = -lopengl32 -lgdi32
endif
else

DGL_FLAGS = $(shell pkg-config --cflags gl x11) -DDGL_NAMESPACE=CarlaDGL
DGL_LIBS = $(shell pkg-config --libs gl x11)
DGL_FLAGS = $(shell pkg-config --cflags gl x11)
DGL_LIBS = $(shell pkg-config --libs gl x11)
endif

DGL_FLAGS += -DDGL_NAMESPACE=CarlaDGL
endif

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


Loading…
Cancel
Save