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 /embedserv | |
| 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 'embedserv')
| -rw-r--r-- | embedserv/Library_emser.mk | 7 | ||||
| -rw-r--r-- | embedserv/Library_inprocserv.mk | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 617458b94b1e..c261f9448e64 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -45,12 +45,15 @@ $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emser,\ gdi32 \ ole32 \ oleaut32 \ - sal \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,emser)) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 122858ed9413..ffe596a86b0c 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -32,10 +32,13 @@ $(eval $(call gb_Library_set_include,inprocserv,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_libraries,inprocserv,\ +$(eval $(call gb_Library_use_system_win32_libs,inprocserv,\ gdi32 \ ole32 \ uuid \ +)) + +$(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) |