diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 15:31:46 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
commit | dc397aae70433c0086ef41f4dac5289fb07a9b19 (patch) | |
tree | 3252bd411bd7a488c5af8640e37bb947900631df /canvas | |
parent | 80374355ab96fa73f2aee8971195faf3cf5985f5 (diff) |
gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:
add a new gb_LinkTarget_use_system_win32_libs to abstract different
linker options on MSVC and GCC.
Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/Library_canvastools.mk | 2 | ||||
-rw-r--r-- | canvas/Library_directx9canvas.mk | 2 | ||||
-rw-r--r-- | canvas/Library_gdipluscanvas.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d08d76934fac..cb363de2ef04 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -87,7 +87,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,canvastools,\ +$(eval $(call gb_Library_use_system_win32_libs,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index fb2a28b6a928..d45b9066ca9b 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) -$(eval $(call gb_Library_use_libraries,directx9canvas,\ +$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index cfe70a926995..b053b153e5e2 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) -$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ +$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ )) |