diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-03-22 21:28:29 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-03-22 21:28:29 +0100 |
| commit | 74320796326539d0ea31eded4f78637a6824e2e8 (patch) | |
| tree | 86c4ddf83701688794dbf0d9df5540c29bccec90 | |
| parent | 61d72c76d25aa2d315e71fc0ef2eda9c871433d4 (diff) | |
Add support of configure --enable-wayland --disable-gl
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | libdecor/build/Makefile | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0fd58d517..14ede4061 100644 --- a/configure.ac +++ b/configure.ac @@ -1021,10 +1021,20 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [ LDFLAGS="$LDFLAGS -rdynamic -no-pie" AC_SEARCH_LIBS([dlopen], [dl]) - AC_CHECK_HEADER([GL/gl.h], [AC_DEFINE([HAVE_GL])]) - AC_CHECK_HEADER([GL/glu.h], [ - AC_DEFINE([HAVE_GL_GLU_H]) - GLLIBS="$($PKGCONFIG --libs wayland-egl) $($PKGCONFIG --libs egl) $($PKGCONFIG --libs glu) $($PKGCONFIG --libs gl) $GLLIBS" + + AS_IF([test x$enable_gl != xno], [ + AC_CHECK_HEADER([GL/gl.h], [AC_DEFINE([HAVE_GL])]) + AC_CHECK_HEADER([GL/glu.h], [ + AC_DEFINE([HAVE_GL_GLU_H]) + GLLIBS="$($PKGCONFIG --libs wayland-egl) $($PKGCONFIG --libs egl) $($PKGCONFIG --libs glu) $($PKGCONFIG --libs gl) $GLLIBS" + ]) + GLWLDEMO="egl" + ], [ + LINKFLTKGL="" + GLLIBNAME="" + GLDSONAME="" + GLDEMOS="" + GLWLDEMO="" ]) dnl Check for GTK-3 ... diff --git a/libdecor/build/Makefile b/libdecor/build/Makefile index b64ac1561..789283cba 100644 --- a/libdecor/build/Makefile +++ b/libdecor/build/Makefile @@ -22,7 +22,7 @@ OBJECTS = fl_libdecor.o libdecor-cairo-blur.o fl_libdecor-plugins.o \ ../../src/text-input-protocol.o cursor-settings.o os-compatibility.o PROTOCOLS = /usr/share/wayland-protocols -all : demo egl +all : demo $(GLWLDEMO) depend: : echo "libdecor/build: make depend..." |