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

5 files changed, 10 insertions, 84 deletions

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 02af2fbda472..c7c7861275e4 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -343,6 +343,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	use_sdk_api \
 	use_udk_api \
 	use_internal_api \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 243e3cda7b24..0288c1755f71 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -107,6 +107,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 131806f8d273..e4003a9d2682 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -187,6 +187,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index c6e351493911..427c622326ad 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -186,6 +186,10 @@ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_d
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1)))
 endef
 
+define gb_LinkTarget_use_system_win32_libs
+$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib))))
+endef
+
 
 # Library class
 
@@ -213,46 +217,6 @@ gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
 gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
 gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
 
-gb_Library_win32_OLDNAMES := moldname
-
-gb_Library_PLAINLIBS_NONE += \
-	mingwthrd \
-	mingw32 \
-	mingwex \
-	advapi32 \
-	comctl32 \
-	comdlg32 \
-	crypt32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	gdi32 \
-	gdiplus \
-	imm32 \
-	kernel32 \
-	jawt \
-	msi \
-	msimg32 \
-	msvcrt \
-	msvcprt \
-	mpr \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	propsys \
-	shell32 \
-	shlwapi \
-	urlmon \
-	user32 \
-	usp10 \
-	uuid \
-	winmm \
-	version \
-	wininet \
-	winspool \
-	wldap32 \
-	ws2_32 \
-
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 8680c2e63d43..600fa43b57c7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -374,6 +374,9 @@ $(call gb_Helper_abbreviate_dirs,\
 	; exit $$RC)
 endef
 
+define gb_LinkTarget_use_system_win32_libs
+$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(lib).lib))
+endef
 
 # Flags common for PE executables (EXEs and DLLs) 
 gb_Windows_PE_TARGETTYPEFLAGS := \
@@ -401,50 +404,6 @@ gb_Library_get_rpath :=
 gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
-gb_Library_win32_OLDNAMES := oldnames
-
-gb_Library_PLAINLIBS_NONE += \
-	advapi32 \
-	comctl32 \
-	comdlg32 \
-	crypt32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	delayimp \
-	gdi32 \
-	gdiplus \
-	imm32\
-	kernel32 \
-	jawt \
-	libcmt \
-	libcmtd \
-	mpr \
-	mscoree \
-	msi \
-	msimg32 \
-	msvcmrt \
-	msvcmrtd \
-	msvcrt \
-	msvcprt \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	propsys \
-	secur32 \
-	shell32 \
-	shlwapi \
-	urlmon \
-	user32 \
-	usp10 \
-	uuid \
-	version \
-	wininet \
-	winmm \
-	winspool \
-	wldap32 \
-	ws2_32 \
-
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \