summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/AllLangResTarget_fps_office.mk6
-rw-r--r--fpicker/Library_fps.mk5
-rw-r--r--fpicker/Library_fps_aqua.mk9
3 files changed, 7 insertions, 13 deletions
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index 88c1b767985d..f8a8ccd47e69 100644
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -36,15 +36,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
$(eval $(call gb_SrsTarget_use_packages,fps_office/res,\
+ fpicker_inc \
svl_inc \
svtools_inc \
))
-$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
- $$(INCLUDE) \
- -I$(SRCDIR)/fpicker/inc \
-))
-
$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
fpicker/source/office/OfficeFilePicker.src \
fpicker/source/office/iodlg.src \
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 637af5eb0a0d..a4d3c6438b67 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -31,9 +31,8 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
-$(eval $(call gb_Library_set_include,fps,\
- $$(INCLUDE) \
- -I$(SRCDIR)/fpicker/inc \
+$(eval $(call gb_Library_use_packages,fps,\
+ fpicker_inc \
))
$(eval $(call gb_Library_use_api,fps,\
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index fb18d081bf8c..6cb9c18b2252 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -29,16 +29,15 @@ $(eval $(call gb_Library_Library,fps_aqua))
$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
+$(eval $(call gb_Library_use_packages,fps_aqua,\
+ fpicker_inc \
+))
+
$(eval $(call gb_Library_use_api,fps_aqua,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_set_include,fps_aqua,\
- $$(INCLUDE) \
- -I$(SRCDIR)/fpicker/inc \
-))
-
$(eval $(call gb_Library_add_libs,fps_aqua,\
-framework Cocoa \
-framework CoreFoundation \