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 /dtrans | |
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 'dtrans')
-rw-r--r-- | dtrans/Library_dnd.mk | 10 | ||||
-rw-r--r-- | dtrans/Library_ftransl.mk | 10 | ||||
-rw-r--r-- | dtrans/Library_sysdtrans.mk | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 7b6f08621c23..60027e2fef61 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -37,17 +37,19 @@ $(eval $(call gb_Library_set_include,dnd,\ $(eval $(call gb_Library_use_sdk_api,dnd)) $(eval $(call gb_Library_use_libraries,dnd,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,dnd,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,dnd)) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index ae12a2bee575..f4c4e272999f 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -37,16 +37,18 @@ $(eval $(call gb_Library_set_include,ftransl,\ $(eval $(call gb_Library_use_sdk_api,ftransl)) $(eval $(call gb_Library_use_libraries,ftransl,\ - advapi32 \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ sal \ - uwinapi \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,ftransl,\ + advapi32 \ + gdi32 \ + ole32 \ +)) + $(eval $(call gb_Library_add_standard_system_libs,ftransl)) $(eval $(call gb_Library_use_static_libraries,ftransl,\ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 698b9d605936..93e7b696604b 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -42,17 +42,19 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\ )) $(eval $(call gb_Library_use_libraries,sysdtrans,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) |