diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 14:03:31 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:15:22 +0200 |
| commit | f90c68316c622971706568303a025bbc58351df3 (patch) | |
| tree | 64357377dc4dfc46470c36d9a9a3b62bf7625fb9 /configure.ac | |
| parent | 8a4173987edfeeb7e49c70617d43e3adc911d333 (diff) | |
WASM: add Emscripten demo application
Change-Id: I31297142761255b1f357fc9677a644b7a93c921a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111128
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e5ce5560c661..9a9e42031ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -12528,10 +12528,18 @@ then fi qt5_test_include="QtWidgets/qapplication.h" - qt5_test_library="libQt5Widgets.so" + if test "$_os" = "Emscripten"; then + qt5_test_library="libQt5Widgets.a" + else + qt5_test_library="libQt5Widgets.so" + fi dnl Check for qmake5 - AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH]) + if test -n "$QT5DIR"; then + AC_PATH_PROG(QMAKE5, [qmake], no, [$QT5DIR/bin]) + else + AC_PATH_PROGS(QMAKE5, [qmake-qt5 qmake], no) + fi if test "$QMAKE5" = "no"; then AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) else @@ -12550,6 +12558,8 @@ then qt5_incdirs="`$QMAKE5 -query QT_INSTALL_HEADERS` $qt5_incdirs" qt5_libdirs="`$QMAKE5 -query QT_INSTALL_LIBS` $qt5_libdirs" + qt5_platformsdir="`$QMAKE5 -query QT_INSTALL_PLUGINS`/platforms" + QT5_PLATFORMS_SRCDIR="$qt5_platformsdir" AC_MSG_CHECKING([for Qt5 headers]) qt5_incdir="no" @@ -12585,9 +12595,21 @@ then AC_MSG_ERROR([Qt5 libraries not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) fi + if test "$_os" = "Emscripten"; then + if test ! -f "$QT5_PLATFORMS_SRCDIR"/wasm_shell.html ; then + QT5_PLATFORMS_SRCDIR="${QT5_PLATFORMS_SRCDIR/plugins/src\/plugins}/wasm" + fi + if test ! -f "${qt5_platformsdir}"/libqwasm.a -o ! -f "$QT5_PLATFORMS_SRCDIR"/wasm_shell.html; then + AC_MSG_ERROR([No Qt5 WASM QPA plugin found in ${qt5_platformsdir} or ${QT5_PLATFORMS_SRCDIR}]) + fi + fi + QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING" QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" + if test "$_os" = "Emscripten"; then + QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm" + fi if test "$USING_X11" = TRUE; then PKG_CHECK_MODULES(QT5_XCB,[xcb],,[AC_MSG_ERROR([XCB not found, which is needed for correct app grouping in X11.])]) @@ -12627,6 +12649,7 @@ AC_SUBST(MOC5) AC_SUBST(QT5_GOBJECT_CFLAGS) AC_SUBST(QT5_GOBJECT_LIBS) AC_SUBST(QT5_HAVE_GOBJECT) +AC_SUBST(QT5_PLATFORMS_SRCDIR) dnl =================================================================== dnl KF5 Integration |