Browse Source

Initial multi-x11/wayland backend setup

Signed-off-by: falkTX <falktx@falktx.com>
wayland-v2
falkTX 1 month ago
parent
commit
f3a422fdd7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 834 additions and 87 deletions
  1. +10
    -2
      Makefile.base.mk
  2. +1
    -1
      dgl/src/pugl-upstream
  3. +822
    -83
      dgl/src/pugl.cpp
  4. +1
    -1
      tests/Makefile

+ 10
- 2
Makefile.base.mk View File

@@ -556,8 +556,16 @@ else ifeq ($(WINDOWS),true)
OPENGL_FLAGS =
OPENGL_LIBS = -lopengl32
else
OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11)
OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl)
OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl)
ifeq ($(HAVE_X11),true)
OPENGL_FLAGS += $(shell $(PKG_CONFIG) --cflags x11)
OPENGL_LIBS += $(shell $(PKG_CONFIG) --libs x11)
endif
ifeq ($(HAVE_WAYLAND_EGL),true)
OPENGL_FLAGS += $(shell $(PKG_CONFIG) --cflags egl wayland-egl)
OPENGL_LIBS += $(shell $(PKG_CONFIG) --libs egl wayland-egl)
endif
endif

HAVE_CAIRO_OR_OPENGL = true


+ 1
- 1
dgl/src/pugl-upstream

@@ -1 +1 @@
Subproject commit 43c0944a2e28c6921bc827ac46f7215e5e59fe26
Subproject commit ed30e030d78a6d647bf4c1ff19b1b50c627417f0

+ 822
- 83
dgl/src/pugl.cpp
File diff suppressed because it is too large
View File


+ 1
- 1
tests/Makefile View File

@@ -11,7 +11,7 @@ include ../Makefile.base.mk
# ---------------------------------------------------------------------------------------------------------------------

BUILD_C_FLAGS += $(DGL_FLAGS) -I..
BUILD_CXX_FLAGS += $(DGL_FLAGS) -I.. -I../dgl/src/pugl-upstream/include -DDONT_SET_USING_DGL_NAMESPACE
BUILD_CXX_FLAGS += $(DGL_FLAGS) -I.. -I../dgl -I../dgl/src/pugl-upstream/include -DDONT_SET_USING_DGL_NAMESPACE
LINK_FLAGS += -lpthread

# TODO fix within pugl


Loading…
Cancel
Save