|
|
commit 1125479c388b0204b76545deb42516b504c5e38e
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Wed May 26 16:47:59 2021 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Sep 29 12:14:55 2021 +0200
Wayland platform: add step to make the libdecor shared lib
Makefile | 2 +-
configure.ac | 4 ++++
makeinclude.in | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git Makefile Makefile
index d70bfcd..d3a1af4 100644
--- Makefile
+++ Makefile
@@ -16,7 +16,7 @@
include makeinclude
-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fluid test documentation
all: makeinclude fltk-config
for dir in $(DIRS); do\
diff --git configure.ac configure.ac
index 77fabe0..a5a658b 100644
--- configure.ac
+++ configure.ac
@@ -900,6 +900,7 @@ dnl Define OS-specific stuff...
HLINKS=
OSX_ONLY=:
THREADS=
+LIBDECORDIR=""
AC_ARG_WITH([links], AS_HELP_STRING([--with-links], [make header links for common misspellings (default=no)]))
@@ -1016,6 +1017,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
LDFLAGS="$LIBS $LDFLAGS"
DSOFLAGS="$LIBS $DSOFLAGS"
enable_pango=yes
+ LIBDECORDIR="libdecor/build"
AC_SEARCH_LIBS([dlopen], [dl])
AC_CHECK_HEADER([GL/gl.h], [AC_DEFINE([HAVE_GL])])
@@ -1298,6 +1300,8 @@ AC_SUBST([HLINKS])
AC_SUBST([OSX_ONLY])
AC_SUBST([THREADS])
+AC_SUBST([LIBDECORDIR])
+
AC_SUBST([INSTALL_DESKTOP])
AC_SUBST([UNINSTALL_DESKTOP])
diff --git makeinclude.in makeinclude.in
index 5e8d1a0..9466325 100644
--- makeinclude.in
+++ makeinclude.in
@@ -105,6 +105,9 @@ FLTKCAIROOPTION = @FLTKCAIROOPTION@
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
IMAGELIBS = -L../lib @IMAGELIBS@
+# optional extra build step for libdecor:
+LIBDECORDIR = @LIBDECORDIR@
+
# image libraries to build...
IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@
CAIRODIR = @CAIRODIR@
[ Direct Link to Message ] | |
|
| |