diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:54:43 +0200 |
commit | f011af716e2978cbf9fcb7748dc868c503edddff (patch) | |
tree | dffeefe7b502a76a98b1c81674a673d6fd88d711 /canvas | |
parent | 33bf3bd544b200825c081fe367bf64e68714c9b4 (diff) |
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.
Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/Library_cairocanvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_canvasfactory.mk | 2 | ||||
-rw-r--r-- | canvas/Library_canvastools.mk | 2 | ||||
-rw-r--r-- | canvas/Library_directx9canvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_gdipluscanvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_nullcanvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_simplecanvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_vclcanvas.mk | 2 |
8 files changed, 0 insertions, 16 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index b85321f1b0d6..b9c93e21dff3 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ $(gb_UWINAPI) \ )) -$(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 1b66f16a6b57..ec143c36000a 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ $(gb_UWINAPI) \ )) -$(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 cb363de2ef04..752c02befcaf 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ $(gb_UWINAPI) \ )) -$(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 d45b9066ca9b..22a989a308b0 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) - $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index b053b153e5e2..327f9c1b2927 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) - $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index ea7376e41bf5..0032336e2867 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ $(gb_UWINAPI) \ )) -$(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 1fa62e75d91c..02587dd0b3f7 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ $(gb_UWINAPI) \ )) -$(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 53599b5555bf..e22d0dcc7e90 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ $(gb_UWINAPI) \ )) -$(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 \ |