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 /connectivity | |
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 'connectivity')
-rw-r--r-- | connectivity/Library_ado.mk | 9 | ||||
-rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index bd24464a5331..ed088bc89ee5 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\ )) endif +$(eval $(call gb_Library_use_system_win32_libs,ado,\ + ole32 \ + oleaut32 \ + uuid \ +)) + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ sal \ salhelper \ - ole32 \ - oleaut32 \ - uuid \ dbtools \ comphelper \ $(gb_UWINAPI) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 50900b1b7f66..a76eb7b735b6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ +$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ wldap32 \ )) |