Browse Source

Add a few extra defs to help using external dpf/dgl

Signed-off-by: falkTX <falktx@falktx.com>
pull/1748/merge
falkTX 2 years ago
parent
commit
4784fc06e1
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 27 additions and 3 deletions
  1. +11
    -3
      source/Makefile.deps.mk
  2. +16
    -0
      source/Makefile.mk

+ 11
- 3
source/Makefile.deps.mk View File

@@ -178,9 +178,13 @@ ifeq ($(MACOS_OR_WASM_OR_WINDOWS),true)
HAVE_DGL = true
HAVE_YSFXGUI = true
else
HAVE_DGL = $(shell $(PKG_CONFIG) --exists gl x11 && echo true)
HAVE_DBUS = $(shell $(PKG_CONFIG) --exists dbus-1 && echo true)
HAVE_DGL = $(shell $(PKG_CONFIG) --exists gl x11 xcursor xext xrandr && echo true)
HAVE_YSFXGUI = $(shell $(PKG_CONFIG) --exists freetype2 fontconfig gl x11 && echo true)
HAVE_X11 = $(shell $(PKG_CONFIG) --exists x11 && echo true)
HAVE_XCURSOR = $(shell $(PKG_CONFIG) --exists xcursor && echo true)
HAVE_XEXT = $(shell $(PKG_CONFIG) --exists xext && echo true)
HAVE_XRANDR = $(shell $(PKG_CONFIG) --exists xrandr && echo true)
endif

# FIXME update to DGL with wasm compat
@@ -475,8 +479,12 @@ endif
else ifeq ($(WINDOWS),true)
DGL_LIBS = -lopengl32 -lgdi32
else
DGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11)
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 += $(shell $(PKG_CONFIG) --cflags dbus)
DGL_LIBS += $(shell $(PKG_CONFIG) --libs dbus)
endif
endif

endif


+ 16
- 0
source/Makefile.mk View File

@@ -170,6 +170,10 @@ $(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
@@ -232,6 +236,18 @@ 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"'


Loading…
Cancel
Save