diff options
73 files changed, 222 insertions, 253 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 6a2a9ecbdbb9..98d4cbf9ffde 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -107,14 +107,14 @@ $(eval $(call gb_Library_add_libs,merged,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,merged,\ +$(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ gdi32 \ gdiplus \ imm32 \ mpr \ msimg32 \ - $(gb_Library_win32_OLDNAMES) \ + oldnames \ ole32 \ oleaut32 \ shell32 \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a5585e0b8a7..1196385a9a93 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1468,7 +1468,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ -lobjc \ ) else ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ advapi32 \ gdi32 \ ) @@ -1614,7 +1614,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ifeq ($(GUI)$(COM),WNTMSC) $(call gb_LinkTarget_use_external,$(1),openssl) -$(call gb_LinkTarget_use_libraries,$(1),\ +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ ) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index e49661874ccc..2eb16df6c43d 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -132,21 +132,17 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema -gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) -gb_Library_NOILIBFILENAMES += \ +gb_Library_NOILIBFILENAMES := \ glib-2.0 \ gmodule-2.0 \ graphite2_off \ icudt icuin icule icuuc \ langtag \ lcms2 \ - msvcprt \ nspr4 \ nss3 \ - shlwapi \ smime3 \ uwinapi \ - version \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 64750496d43c..ed1cc2d426fa 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -41,9 +41,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ comphelper \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ - oleaut32 \ sal \ tl \ utl \ @@ -53,8 +50,11 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(eval $(call gb_Library_add_standard_system_libs,avmediawin)) -$(eval $(call gb_Library_add_libs,avmediawin,\ - strmiids.lib \ +$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\ + gdi32 \ + ole32 \ + oleaut32 \ + strmiids \ )) $(eval $(call gb_Library_add_exception_objects,avmediawin,\ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 6cd860ee73f9..ce2b096cbcac 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,basctl,\ +$(eval $(call gb_Library_use_system_win32_libs,basctl,\ advapi32 \ gdi32 \ shell32 \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index c09080ce2276..6e871736c1bf 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index e43404a27094..a768ddf007c7 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \ oleaut32 \ )) endif diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index 36806d0e276d..88876b75db9a 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \ oleaut32 \ )) endif diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 2b8e2164f045..94f4a0451c1e 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -47,10 +47,13 @@ endif ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,officebean,\ - jawt \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,officebean,\ + jawt \ +)) + else $(eval $(call gb_Library_add_libs,officebean,\ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d08d76934fac..cb363de2ef04 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -87,7 +87,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,canvastools,\ +$(eval $(call gb_Library_use_system_win32_libs,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index fb2a28b6a928..d45b9066ca9b 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) -$(eval $(call gb_Library_use_libraries,directx9canvas,\ +$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index cfe70a926995..b053b153e5e2 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ $(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) -$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ +$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\ gdi32 \ gdiplus \ )) 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,\ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index bd24464a5331..ed088bc89ee5 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\ )) endif +$(eval $(call gb_Library_use_system_win32_libs,ado,\ + ole32 \ + oleaut32 \ + uuid \ +)) + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ sal \ salhelper \ - ole32 \ - oleaut32 \ - uuid \ dbtools \ comphelper \ $(gb_UWINAPI) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 50900b1b7f66..a76eb7b735b6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ +$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ wldap32 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 059044fcafc4..23321fc64cce 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,cui,\ +$(eval $(call gb_Library_use_system_win32_libs,cui,\ advapi32 \ shlwapi \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 579deb6618ba..8d35b1f3da53 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(eval $(call gb_Library_add_standard_system_libs,dbu)) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,dbu,\ +$(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ oleaut32 \ uuid \ 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 \ )) diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 7b6f08621c23..60027e2fef61 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -37,17 +37,19 @@ $(eval $(call gb_Library_set_include,dnd,\ $(eval $(call gb_Library_use_sdk_api,dnd)) $(eval $(call gb_Library_use_libraries,dnd,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,dnd,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,dnd)) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index ae12a2bee575..f4c4e272999f 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -37,16 +37,18 @@ $(eval $(call gb_Library_set_include,ftransl,\ $(eval $(call gb_Library_use_sdk_api,ftransl)) $(eval $(call gb_Library_use_libraries,ftransl,\ - advapi32 \ cppu \ cppuhelper \ - gdi32 \ - ole32 \ sal \ - uwinapi \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,ftransl,\ + advapi32 \ + gdi32 \ + ole32 \ +)) + $(eval $(call gb_Library_add_standard_system_libs,ftransl)) $(eval $(call gb_Library_use_static_libraries,ftransl,\ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 698b9d605936..93e7b696604b 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -42,17 +42,19 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\ )) $(eval $(call gb_Library_use_libraries,sysdtrans,\ - advapi32 \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\ + advapi32 \ gdi32 \ ole32 \ oleaut32 \ - sal \ shell32 \ uuid \ - uwinapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index d3ca7501e8cd..b4c8e6bb7be9 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -63,6 +63,9 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,emboleobj,\ embobj \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emboleobj,\ gdi32 \ ole32 \ oleaut32 \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 617458b94b1e..c261f9448e64 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -45,12 +45,15 @@ $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ cppu \ cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,emser,\ gdi32 \ ole32 \ oleaut32 \ - sal \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,emser)) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 122858ed9413..ffe596a86b0c 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -32,10 +32,13 @@ $(eval $(call gb_Library_set_include,inprocserv,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_libraries,inprocserv,\ +$(eval $(call gb_Library_use_system_win32_libs,inprocserv,\ gdi32 \ ole32 \ uuid \ +)) + +$(eval $(call gb_Library_use_libraries,inprocserv,\ $(gb_UWINAPI) \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 766552e29396..b5e88d2ba1e0 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\ shell32 \ ole32 \ )) diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 1117bce24681..05bf003cd550 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -67,18 +67,18 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ ooopathutils \ )) -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) endif # WNT diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index d503cf6bb8cc..3b9c341445af 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ldapbe2,\ +$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ wldap32 \ )) else # 0S!=WNT diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 7e8b400d6eb8..6528b3d3c4b7 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -69,18 +69,18 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ )) -$(eval $(call gb_Library_use_libraries,npsoplugin,\ - ws2_32 \ - shell32 \ - ole32 \ - kernel32 \ - user32 \ - gdi32 \ - winspool \ - comdlg32 \ +$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\ advapi32 \ + comdlg32 \ + gdi32 \ + kernel32 \ + ole32 \ oleaut32 \ + shell32 \ + user32 \ uuid \ + winspool \ + ws2_32 \ )) $(eval $(call gb_Library_add_defs,npsoplugin,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 43404503b1dc..d86a604b1b9a 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -43,6 +43,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index e258e0fa1cc1..c7f1a0152034 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -47,6 +47,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge2,\ cppuhelper \ cppu \ sal \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\ advapi32 \ ole32 \ oleaut32 \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 34b147320771..dc5e6c4f9cde 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -63,10 +63,10 @@ $(eval $(call gb_Library_add_libs,pl,\ endif # OS=SOLARIS ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,pl,\ - version \ - ole32 \ +$(eval $(call gb_Library_use_system_win32_libs,pl,\ advapi32 \ + ole32 \ + version \ )) $(eval $(call gb_Library_add_exception_objects,pl,\ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 33cccab682fd..733de14eab86 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -54,14 +54,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 7bcf286cb4f0..9bc43840d8a3 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -57,14 +57,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ )) -$(eval $(call gb_Library_use_libraries,so_activex_x64,\ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ advapi32 \ + gdi32 \ ole32 \ oleaut32 \ - gdi32 \ - urlmon \ shlwapi \ + urlmon \ + uuid \ )) ifneq ($(USE_DEBUG_RUNTIME),) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index cd291c8b695d..d03cb0c6060c 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,updchk,\ +$(eval $(call gb_Library_use_system_win32_libs,updchk,\ ole32 \ shell32 \ wininet \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 05f84ea2b1ba..b3b3fc3a3d4a 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -52,6 +52,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ tl \ utl \ vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,fps,\ advapi32 \ comdlg32 \ gdi32 \ @@ -60,7 +64,6 @@ $(eval $(call gb_Library_use_libraries,fps,\ oleaut32 \ shell32 \ uuid \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Library_add_standard_system_libs,fps)) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index ac51b15602a6..eab6f7a4f44c 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,fwi,\ +$(eval $(call gb_Library_use_system_win32_libs,fwi,\ advapi32 \ )) endif diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 5ca70188fcf3..7b44aa42984a 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,hwp,\ +$(eval $(call gb_Library_use_system_win32_libs,hwp,\ ole32 \ uuid \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 73a2e6bd5e5c..5051a2b9bb17 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -50,8 +50,8 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,jvmfwk,\ - advapi32 \ +$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ + advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index e25d993fac2d..61ff7bdfe5ac 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -62,9 +62,8 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ - advapi32 \ - uwinapi \ +$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ + advapi32 \ )) endif diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 17ac265b0aed..239a43491b3a 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,neon,\ +$(eval $(call gb_Library_use_system_win32_libs,neon,\ ws2_32 \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 36ace0d32738..ecec9fffd76c 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -57,21 +57,22 @@ $(eval $(call gb_Library_add_defs,sal,\ )) $(eval $(call gb_Library_use_libraries,sal,\ - $(if $(filter $(OS),WNT), \ - advapi32 \ - comdlg32 \ - mpr \ - ole32 \ - shell32 \ - user32 \ - ws2_32 \ - ) \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_system_win32_libs,sal,\ + advapi32 \ + comdlg32 \ + mpr \ + ole32 \ + shell32 \ + user32 \ + ws2_32 \ +)) + $(eval $(call gb_Library_add_libs,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index c5356c9f00d0..75a3a9cffca4 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_use_libraries,uwinapi,\ +$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ msvcrt \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 86f7f8c4d0f8..807d7fd7591d 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -121,10 +121,10 @@ $(eval $(call gb_Library_add_exception_objects,scui,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,scui,\ +$(eval $(call gb_Library_use_system_win32_libs,scui,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index e0e71a0da812..791175d5e08c 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -143,10 +143,10 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vbaobj,\ +$(eval $(call gb_Library_use_system_win32_libs,vbaobj,\ advapi32 \ - $(gb_Library_win32_OLDNAMES) \ - uwinapi \ + oldnames \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 70f742949bc4..4d175957c35a 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ $(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ ws2_32 \ )) endif diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 3ac73b8f0857..d8dd7c095133 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -114,7 +114,7 @@ $(eval $(call gb_Library_use_externals,sd,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,sd,\ +$(eval $(call gb_Library_use_system_win32_libs,sd,\ ws2_32 \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c384a1b98046..1ec228446b2f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -295,12 +295,12 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/syspathw32 \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - gdi32 \ - advapi32 \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,sfx,\ + advapi32 \ + gdi32 \ + ole32 \ + shell32 \ + uuid \ )) endif 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)) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index cf911a1d4f2a..012262256290 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ )) else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_libraries,OGLTrans,\ +$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ 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) \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index 791f2716e659..505f63ea9683 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ $(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \ oleaut32 \ )) endif diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 1f40a65b5001..e001aa4b62cc 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -271,7 +271,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,svt,\ +$(eval $(call gb_Library_use_system_win32_libs,svt,\ advapi32 \ gdi32 \ ole32 \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index b679787d856f..1cb9d8f78e25 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,12 +71,11 @@ $(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ - kernel32 \ - msvcrt \ - $(gb_Library_win32_OLDNAMES) \ - user32 \ - uwinapi \ +$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ )) endif diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 3981bac35735..b7802267c891 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -117,11 +117,11 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/win/source/dll/toolsdll \ )) -$(eval $(call gb_Library_use_libraries,tl,\ - mpr \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,tl,\ + mpr \ + ole32 \ + shell32 \ + uuid \ )) endif diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index b6149a1dd3e8..c8053c180c9f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,ucpdav1,\ +$(eval $(call gb_Library_use_system_win32_libs,ucpdav1,\ ws2_32 \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 341439ab23fe..02dae7d43f95 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -314,11 +314,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,vcl,\ - version \ -)) -endif $(eval $(call gb_Library_use_external,vcl,graphite)) @@ -640,21 +635,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -$(eval $(call gb_Library_use_libraries,vcl,\ - advapi32 \ - gdi32 \ - gdiplus \ - imm32 \ - mpr \ - msimg32 \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + mpr \ + msimg32 \ + oldnames \ + ole32 \ + shell32 \ usp10 \ - uwinapi \ - winspool \ - version \ + uuid \ + version \ + winspool \ )) $(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 3966e76e4052..27479a3fc63f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1-mscrypto \ )) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ +$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ crypt32 \ advapi32 \ )) |