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

9 files changed, 24 insertions, 15 deletions

diff --git a/shell/Executable_senddoc.mk b/shell/Executable_senddoc.mk
index 47c5b82827f7..13083ce77eb5 100644
--- a/shell/Executable_senddoc.mk
+++ b/shell/Executable_senddoc.mk
@@ -27,8 +27,11 @@
 
 $(eval $(call gb_Executable_Executable,senddoc))
 
-$(eval $(call gb_Executable_use_libraries,senddoc,\
+$(eval $(call gb_Executable_use_system_win32_libs,senddoc,\
 	kernel32 \
+))
+
+$(eval $(call gb_Executable_use_libraries,senddoc,\
 	sal \
 ))
 
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 62c18edf4a90..2607fea33401 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -53,19 +53,19 @@ $(eval $(call gb_Library_use_externals,ooofilt,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,ooofilt,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	advapi32 \
 	comctl32 \
 	kernel32 \
 	msvcprt \
+	oldnames \
 	ole32 \
 	shell32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 ifneq ($(PRODUCT),full)
-$(eval $(call gb_Library_use_libraries,ooofilt,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	msvcrt \
 ))
 endif
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 3ddaeec9d6c2..f0232ba75e82 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,ooofilt_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,ooofilt_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	propsys \
 	shell32 \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 5ca9e91d6732..82e7db10a4ce 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
+$(eval $(call gb_Library_use_system_win32_libs,propertyhdl,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 323335f55d64..46cfd15909e8 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	propsys \
@@ -74,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
 	shlwapi \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index e4794cf4312d..9118f08f5018 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,shlxthdl,\
+$(eval $(call gb_Library_use_system_win32_libs,shlxthdl,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 2b5555a7c715..aa6ff0462480 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,shlxthdl_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	shell32 \
 	shlwapi \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk
index 0b4cc0d01590..0e8cce656519 100644
--- a/shell/Library_smplmail.mk
+++ b/shell/Library_smplmail.mk
@@ -29,8 +29,11 @@ $(eval $(call gb_Library_Library,smplmail))
 
 $(eval $(call gb_Library_use_sdk_api,smplmail))
 
-$(eval $(call gb_Library_use_libraries,smplmail,\
+$(eval $(call gb_Library_use_system_win32_libs,smplmail,\
 	advapi32 \
+))
+
+$(eval $(call gb_Library_use_libraries,smplmail,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
index b6ba2b4333fa..d1b5d0db498a 100644
--- a/shell/Library_syssh_win.mk
+++ b/shell/Library_syssh_win.mk
@@ -32,12 +32,15 @@ $(eval $(call gb_Library_use_sdk_api,syssh))
 $(eval $(call gb_Library_use_libraries,syssh,\
 	cppu \
 	cppuhelper \
-	ole32 \
 	sal \
-	shell32 \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,syssh,\
+	ole32 \
+	shell32 \
+))
+
 $(eval $(call gb_Library_add_standard_system_libs,syssh))
 
 $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))