diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-20 12:55:41 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-26 13:58:41 +0200 |
commit | d8c751008a0997ab9a171675b27b238ba503986a (patch) | |
tree | 641c13a74b74b1adc37ddc3888f11bd1eed4208e /libreofficekit | |
parent | ffb9dcce397f5b13b675b5849457bb98ca9c8e8e (diff) |
Enable gtktiledviewer on Windows
A new configure argument is introduced:
--with-gtk3-build=<absolute path to GTK3 build>
When provided, libreofficekit_selectionhandles package, libreofficekitgtk
library and gtktiledviewer executable would be built on Windows using the
GTK3 libraries in the passed directory, that must contain lib/pkgconfig
subdirectory with correct pkg-config data.
Change-Id: I6504af6eec0fc73cceb26a1ce923337abe14b5c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141624
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'libreofficekit')
-rw-r--r-- | libreofficekit/Executable_gtktiledviewer.mk | 5 | ||||
-rw-r--r-- | libreofficekit/Library_libreofficekitgtk.mk | 1 | ||||
-rw-r--r-- | libreofficekit/Module_libreofficekit.mk | 10 | ||||
-rw-r--r-- | libreofficekit/README.md | 13 | ||||
-rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 1 |
5 files changed, 29 insertions, 1 deletions
diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk index f5d6ddfc89d8..b2383ee0c964 100644 --- a/libreofficekit/Executable_gtktiledviewer.mk +++ b/libreofficekit/Executable_gtktiledviewer.mk @@ -29,12 +29,17 @@ $(eval $(call gb_Executable_add_cxxflags,gtktiledviewer,\ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ $(GTK3_LIBS) \ +)) + +ifneq ($(OS), WNT) +$(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lX11 \ -lXext \ -lXrender \ -lSM \ -lICE \ )) +endif $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ libreofficekitgtk \ diff --git a/libreofficekit/Library_libreofficekitgtk.mk b/libreofficekit/Library_libreofficekitgtk.mk index fba5cbb93fc6..4430c039703b 100644 --- a/libreofficekit/Library_libreofficekitgtk.mk +++ b/libreofficekit/Library_libreofficekitgtk.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_add_libs,libreofficekitgtk,\ $(eval $(call gb_Library_add_defs,libreofficekitgtk,\ -DLOK_PATH="\"$(LIBDIR)/libreoffice/$(LIBO_LIB_FOLDER)\"" \ + -DLOK_DOC_VIEW_IMPLEMENTATION \ )) ifeq ($(OS),$(filter LINUX %BSD SOLARIS, $(OS))) diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk index bf75f359e13e..7452b2da3f8f 100644 --- a/libreofficekit/Module_libreofficekit.mk +++ b/libreofficekit/Module_libreofficekit.mk @@ -33,6 +33,16 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\ UIConfig_libreofficekit \ )) +else ifeq ($(OS),WNT) + +ifneq ($(ENABLE_GTKTILEDVIEWER),) +$(eval $(call gb_Module_add_targets,libreofficekit,\ + Library_libreofficekitgtk \ + Executable_gtktiledviewer \ + Package_selectionhandles \ +)) +endif + endif # vim: set ts=4 sw=4 et: diff --git a/libreofficekit/README.md b/libreofficekit/README.md index 7eb7bb5fd355..95a33707a28a 100644 --- a/libreofficekit/README.md +++ b/libreofficekit/README.md @@ -97,6 +97,19 @@ To debug with `gdb`: before `bin/run`, this will run gtktiledviewer in the debugger instead. +### Building and running gtktiledviewer on Windows + +A pre-requisite is pre-built GTK3 libraries. See [official GTK documentation](https://www.gtk.org/docs/installations/windows/). +Building of gtktiledviewer on Windows is enabled by passing + + --with-gtk3-build=<path/to/GTK3/build/directory> + +to configure. + +Running the compiled executable requires GTK's bin in PATH: + + PATH=${PATH}:/cygdrive/c/gtk-build/gtk/x64/release/bin bin/run gtktiledviewer --lo-path=$(cygpath -am $PWD/instdir/program) ../test.odt + ## LibreOfficeKitGtk Currently consists of only a very basic GTK document viewer widget. diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index ce4bd1890619..f52330bcbd56 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -338,7 +338,6 @@ static void lok_doc_view_initable_iface_init (GInitableIface *iface); static void callbackWorker (int nType, const char* pPayload, void* pData); static void updateClientZoom (LOKDocView *pDocView); -SAL_DLLPUBLIC_EXPORT GType lok_doc_view_get_type(); #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-function" |