[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk fpicker/Module_fpicker.mk

[Jim Jagielski]

 fpicker/Library_fps_aqua.mk |    3 +++
 fpicker/Module_fpicker.mk   |    5 +++++
 2 files changed, 8 insertions(+)

New commits:
commit b1d5f4b57181db38a0543c18960a4d0de191b454
Author: Jim Jagielski <jim at apache.org>
Date:   Sat Oct 14 20:19:37 2017 +0000

    We actually need to build fpicker for macOS/aqua

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 96efa4d89276..d42296d19489 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -58,5 +58,8 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
 	fpicker/source/aqua/AquaFilePickerDelegate \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,fps_aqua,\
+    -x objective-c++ \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index dcd4070e9c23..5c5839ea13db 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -59,4 +59,9 @@ $(eval $(call gb_Module_add_targets,fpicker,\
 ))
 endif
 
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,fpicker,\
+	Library_fps_aqua \
+))
+endif
 # vim: set noet sw=4 ts=4: