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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 341439ab23fe..02dae7d43f95 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -314,11 +314,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vcl,\ - version \ -)) -endif $(eval $(call gb_Library_use_external,vcl,graphite)) @@ -640,21 +635,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -$(eval $(call gb_Library_use_libraries,vcl,\ - advapi32 \ - gdi32 \ - gdiplus \ - imm32 \ - mpr \ - msimg32 \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + mpr \ + msimg32 \ + oldnames \ + ole32 \ + shell32 \ usp10 \ - uwinapi \ - winspool \ - version \ + uuid \ + version \ + winspool \ )) $(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) |