LADI
/
carla
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak external dgl usage 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-03-05 18:50:33 +01:00
parent aeccf6ab37
commit c11cd7b3b8
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Makefile.deps.mk
View File

@ -479,9 +479,11 @@ endif
else ifeq ($(WINDOWS),true)
DGL_LIBS = -lopengl32 -lgdi32
else
DGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11 xcursor xext xrandr)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11 xcursor xext xrandr)
DGL_FLAGS = -DHAVE_XCURSOR -DHAVE_XEXT -DHAVE_XSYNC -DHAVE_XRANDR
DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags gl x11 xcursor xext xrandr)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11 xcursor xext xrandr)
ifeq ($(HAVE_DBUS)$(STATIC_PLUGIN_TARGET)$(USING_CUSTOM_DPF),truetruetrue)
DGL_FLAGS += -DHAVE_DBUS
DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags dbus-1)
DGL_LIBS += $(shell $(PKG_CONFIG) --libs dbus-1)
endif

16
source/Makefile.mk
View File

@ -170,10 +170,6 @@ $(error jackbridge direct mode requested, but jack not available)
endif
endif
ifeq ($(HAVE_DBUS),true)
BASE_FLAGS += -DHAVE_DBUS
endif
ifeq ($(HAVE_DGL),true)
BASE_FLAGS += -DHAVE_DGL
BASE_FLAGS += -DHAVE_OPENGL
@ -236,18 +232,6 @@ ifeq ($(HAVE_X11),true)
BASE_FLAGS += -DHAVE_X11
endif
ifeq ($(HAVE_XCURSOR),true)
BASE_FLAGS += -DHAVE_XCURSOR
endif
ifeq ($(HAVE_XEXT),true)
BASE_FLAGS += -DHAVE_XEXT -DHAVE_XSYNC
endif
ifeq ($(HAVE_XRANDR),true)
BASE_FLAGS += -DHAVE_XRANDR
endif
ifeq ($(USING_JUCE),true)
BASE_FLAGS += -DUSING_JUCE
BASE_FLAGS += -DJUCE_APP_CONFIG_HEADER='"AppConfig.h"'