diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 00:49:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:06 +0200 |
| commit | b85c34978356eb01311f197f00f4dd5f808e3664 (patch) | |
| tree | 7bd759b1b780bb0433609e18736fc6a6816ac19f /fpicker | |
| parent | 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 (diff) | |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/Library_fpicker.mk | 3 | ||||
| -rw-r--r-- | fpicker/Library_fps.mk | 3 | ||||
| -rw-r--r-- | fpicker/Library_fps_aqua.mk | 3 | ||||
| -rw-r--r-- | fpicker/Library_fps_odma.mk | 3 | ||||
| -rw-r--r-- | fpicker/Library_fps_office.mk | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index fdba80e5e721..c18687564d4d 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svt \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fpicker)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 95e315743eca..05f84ea2b1ba 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ shell32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index cb7e1a9e7c77..2c7665855779 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ sal \ tl \ vcl \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) + $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 08eff663bfac..dbb1fe382339 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 2db54954bdeb..5582ffb076e2 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_office)) + $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ |