Skip to content

Commit 3144e96

Browse files
committed
Initial multi-x11/wayland backend setup
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 75aa07f commit 3144e96

4 files changed

Lines changed: 834 additions & 87 deletions

File tree

Makefile.base.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,16 @@ else ifeq ($(WINDOWS),true)
556556
OPENGL_FLAGS =
557557
OPENGL_LIBS = -lopengl32
558558
else
559-
OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
560-
OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11)
559+
OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl)
560+
OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl)
561+
ifeq ($(HAVE_X11),true)
562+
OPENGL_FLAGS += $(shell $(PKG_CONFIG) --cflags x11)
563+
OPENGL_LIBS += $(shell $(PKG_CONFIG) --libs x11)
564+
endif
565+
ifeq ($(HAVE_WAYLAND_EGL),true)
566+
OPENGL_FLAGS += $(shell $(PKG_CONFIG) --cflags egl wayland-egl)
567+
OPENGL_LIBS += $(shell $(PKG_CONFIG) --libs egl wayland-egl)
568+
endif
561569
endif
562570

563571
HAVE_CAIRO_OR_OPENGL = true

dgl/src/pugl-upstream

Submodule pugl-upstream updated 155 files

0 commit comments

Comments
 (0)