diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 15:31:46 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:54:37 +0200 |
| commit | 8831c592e80288be39a9e5f4d20e617b55682003 (patch) | |
| tree | afe65e46df33df883131fa5012e13547ba15dc4d /sal/Library_sal.mk | |
| parent | 578e195cf3120508422a317cc7fac870ae0a3a7f (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 'sal/Library_sal.mk')
| -rw-r--r-- | sal/Library_sal.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 36ace0d32738..ecec9fffd76c 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,21 +57,22 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),WNT), \ - advapi32 \ - comdlg32 \ - mpr \ - ole32 \ - shell32 \ - user32 \ - ws2_32 \ - ) \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,sal,\ + advapi32 \ + comdlg32 \ + mpr \ + ole32 \ + shell32 \ + user32 \ + ws2_32 \ +)) + $(eval $(call gb_Library_add_libs,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ |