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 /sal | |
parent | gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris (diff) | |
download | core-dc397aae70433c0086ef41f4dac5289fb07a9b19.tar.gz core-dc397aae70433c0086ef41f4dac5289fb07a9b19.zip |
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')
-rw-r--r-- | sal/Library_sal.mk | 19 | ||||
-rw-r--r-- | sal/Library_uwinapi.mk | 2 |
2 files changed, 11 insertions, 10 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),, \ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index c5356c9f00d0..75a3a9cffca4 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_use_libraries,uwinapi,\ +$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ msvcrt \ |