Tweak external dgl usage

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Mar 5, 2023 · c11cd7b · c11cd7b
1 parent aeccf6a
commit c11cd7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/source/Makefile.deps.mk b/source/Makefile.deps.mk
@@ -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

diff --git a/source/Makefile.mk b/source/Makefile.mk
@@ -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"'