CWS gnumake3: use standard linked libs on Windows

5 files changed, 5 insertions, 42 deletions

diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 86a2ec05eb65..ed3f2b036b8b 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,msword,\
@@ -127,15 +128,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,msword,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 22fa204665ce..1bc351268f09 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     vcl \
     vos3 \
     xo \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sw,\
@@ -750,15 +751,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,sw,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index fb84b2848ae8..45795479eab9 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,swd,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,swd,\
@@ -79,12 +80,6 @@ $(eval $(call gb_Library_add_linked_libs,swd,\
     kernel32 \
     msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,swd,\
-    kernel32 \
-    msvcrt \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 22430501f810..3d039601df0a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,swui,\
@@ -179,15 +180,6 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,swui,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 8bbb6255452f..c33a8e4df8f1 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
     utl \
     vbahelper \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
@@ -135,15 +136,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4: