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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/Executable_quickstart.mk | 11 | ||||
| -rw-r--r-- | desktop/Executable_soffice.mk | 5 | ||||
| -rw-r--r-- | desktop/Library_deploymentgui.mk | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8e2bc84ad6ef..aecd9b37dd2b 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -33,12 +33,15 @@ $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ comdlg32 \ gdi32 \ ole32 \ oleaut32 \ shell32 \ +)) + +$(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) @@ -46,14 +49,14 @@ $(eval $(call gb_Executable_add_standard_system_libs,quickstart)) ifeq ($(COM),GCC) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ uuid \ )) else -$(eval $(call gb_Executable_add_libs,quickstart,\ - comsupp.lib \ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ + comsupp \ )) endif diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index afe746dc01d9..302c978a0096 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -30,10 +30,13 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) $(eval $(call gb_Executable_use_libraries,soffice,\ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,soffice)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f81be8c52f41..712a020262ab 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,deploymentgui,\ +$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ ole32 \ )) |