Kaydet (Commit) 99614e0a authored tarafından Kacper Kasper's avatar Kacper Kasper Kaydeden (comit) Thorsten Behrens

Allow building Qt5 backend on Haiku

Change-Id: I7e928e9e29076bdfaaeffb83791bdc35f1952055
Reviewed-on: https://gerrit.libreoffice.org/53892Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 36847ce4
...@@ -311,6 +311,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \ ...@@ -311,6 +311,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
)) ))
endif endif
ifeq ($(OS),HAIKU)
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,haiku, \
$(if $(ENABLE_QT5),vclplug_qt5) \
))
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
sm \ sm \
smd \ smd \
......
...@@ -4626,6 +4626,7 @@ fi ...@@ -4626,6 +4626,7 @@ fi
if test "$OS" = "HAIKU"; then if test "$OS" = "HAIKU"; then
enable_cairo_canvas=yes enable_cairo_canvas=yes
test_qt5=yes
fi fi
dnl =================================================================== dnl ===================================================================
......
...@@ -670,6 +670,12 @@ $(eval $(call gb_Library_add_libs,vcl,\ ...@@ -670,6 +670,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lbe \ -lbe \
)) ))
ifeq ($(ENABLE_QT5),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/unx/generic/plugadapt/salplug \
))
endif
$(eval $(call gb_Library_use_externals,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\
cairo \ cairo \
fontconfig \ fontconfig \
......
...@@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,vclplug_qt5,\ ...@@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,vclplug_qt5,\
$(eval $(call gb_Library_use_sdk_api,vclplug_qt5)) $(eval $(call gb_Library_use_sdk_api,vclplug_qt5))
$(eval $(call gb_Library_use_libraries,vclplug_qt5,\ $(eval $(call gb_Library_use_libraries,vclplug_qt5,\
vclplug_gen \ $(if $(USING_X11),vclplug_gen) \
vcl \ vcl \
tl \ tl \
utl \ utl \
......
...@@ -115,6 +115,15 @@ $(eval $(call gb_Module_add_targets,vcl,\ ...@@ -115,6 +115,15 @@ $(eval $(call gb_Module_add_targets,vcl,\
)) ))
endif endif
ifeq ($(OS),HAIKU)
ifneq ($(ENABLE_QT5),)
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_qt5_moc \
Library_vclplug_qt5 \
))
endif
endif
ifneq ($(ENABLE_FUZZERS),) ifneq ($(ENABLE_FUZZERS),)
$(eval $(call gb_Module_add_targets,vcl,\ $(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_nativecore \ CustomTarget_nativecore \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment