Browse Source

Set DGL flags correctly

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 1 year ago
parent
commit
3b92085050
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 9 additions and 7 deletions
  1. +9
    -7
      source/Makefile.deps.mk

+ 9
- 7
source/Makefile.deps.mk View File

@@ -469,20 +469,22 @@ endif


ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_DGL),true)


DGL_FLAGS = -DHAVE_OPENGL -DDGL_OPENGL -DHAVE_DGL

ifeq ($(HAIKU),true) ifeq ($(HAIKU),true)
DGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs gl) -lbe
DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags gl)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs gl) -lbe
else ifeq ($(MACOS),true) else ifeq ($(MACOS),true)
DGL_FLAGS = -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations
DGL_LIBS = -framework OpenGL -framework Cocoa -framework CoreVideo
DGL_FLAGS += -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations
DGL_LIBS = -framework OpenGL -framework Cocoa -framework CoreVideo
else ifeq ($(WASM),true) else ifeq ($(WASM),true)
ifneq ($(USE_GLES2)$(USE_GLES3),true) ifneq ($(USE_GLES2)$(USE_GLES3),true)
DGL_LIBS = -sLEGACY_GL_EMULATION -sGL_UNSAFE_OPTS=0
DGL_LIBS = -sLEGACY_GL_EMULATION -sGL_UNSAFE_OPTS=0
endif endif
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
DGL_LIBS = -lopengl32 -lgdi32
DGL_LIBS = -lopengl32 -lgdi32
else else
DGL_FLAGS = -DHAVE_XCURSOR -DHAVE_XEXT -DHAVE_XSYNC -DHAVE_XRANDR
DGL_FLAGS += -DHAVE_X11 -DHAVE_XCURSOR -DHAVE_XEXT -DHAVE_XSYNC -DHAVE_XRANDR
DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags gl x11 xcursor xext xrandr) DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags gl x11 xcursor xext xrandr)
DGL_LIBS = $(shell $(PKG_CONFIG) --libs 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) ifeq ($(HAVE_DBUS)$(STATIC_PLUGIN_TARGET)$(USING_CUSTOM_DPF),truetruetrue)


Loading…
Cancel
Save