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 /cli_ure | |
| 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 'cli_ure')
| -rw-r--r-- | cli_ure/Executable_climaker.mk | 7 | ||||
| -rw-r--r-- | cli_ure/Library_cli_cppuhelper_native.mk | 7 | ||||
| -rw-r--r-- | cli_ure/Library_cli_uno.mk | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index e6abcf5f55bf..73dcb63bd21d 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -24,13 +24,16 @@ $(eval $(call gb_Executable_use_internal_bootstrap_api,climaker,\ $(eval $(call gb_Executable_use_libraries,climaker,\ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,climaker,\ mscoree \ $(if $(USE_DEBUG_RUNTIME) \ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,climaker)) diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 22985750b659..745c69c9480c 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -33,16 +33,19 @@ $(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\ )) $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\ - advapi32 \ cppu \ cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\ + advapi32 \ delayimp \ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_cppuhelper_native,\ diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 55288dee2aae..3166365bb1d4 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -19,12 +19,15 @@ $(eval $(call gb_Library_use_udk_api,cli_uno)) $(eval $(call gb_Library_use_libraries,cli_uno,\ cppu \ + sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,cli_uno,\ mscoree \ $(if $(USE_DEBUG_RUNTIME)\ ,msvcmrtd \ ,msvcmrt \ ) \ - sal \ )) $(eval $(call gb_Library_add_exception_objects,cli_uno,\ |