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 /canvas | |
parent | gbuild: split uwinapi out of gb_STDLIBS (diff) | |
download | core-b85c34978356eb01311f197f00f4dd5f808e3664.tar.gz core-b85c34978356eb01311f197f00f4dd5f808e3664.zip |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/Library_cairocanvas.mk | 3 | ||||
-rw-r--r-- | canvas/Library_canvasfactory.mk | 3 | ||||
-rw-r--r-- | canvas/Library_canvastools.mk | 3 | ||||
-rw-r--r-- | canvas/Library_directx9canvas.mk | 3 | ||||
-rw-r--r-- | canvas/Library_gdipluscanvas.mk | 3 | ||||
-rw-r--r-- | canvas/Library_nullcanvas.mk | 3 | ||||
-rw-r--r-- | canvas/Library_simplecanvas.mk | 3 | ||||
-rw-r--r-- | canvas/Library_vclcanvas.mk | 3 |
8 files changed, 16 insertions, 8 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 74ded07486cf..85ea94cda4ed 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ i18nisolang1 \ canvastools \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cairocanvas)) + $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_cachedbitmap \ canvas/source/cairo/cairo_cairo \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 974231a039a1..1b66f16a6b57 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) + $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4e70f654c6ad..d08d76934fac 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvastools)) + $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/cachedprimitivebase \ canvas/source/tools/canvascustomspritehelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 08ffdf4017fe..fb2a28b6a928 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) + $(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 6ae93a809466..cfe70a926995 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) + $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index a130dfb39fbe..ea7376e41bf5 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,nullcanvas)) + $(eval $(call gb_Library_add_exception_objects,nullcanvas,\ canvas/source/null/null_canvasbitmap \ canvas/source/null/null_canvascustomsprite \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index d5edd33bbfbe..1fa62e75d91c 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) + $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 922e5ca45dfc..53599b5555bf 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclcanvas)) + $(eval $(call gb_Library_add_exception_objects,vclcanvas,\ canvas/source/vcl/backbuffer \ canvas/source/vcl/bitmapbackbuffer \ |