summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-09-26 23:45:28 +0200
committerMichael Stahl <mstahl@redhat.com>2012-09-28 16:49:05 +0200
commit2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 (patch)
treea9490f3ae4a64e0de2e1982dfbc4a8e28836070f
parentd26118611f108b12815a5e5735992cd591abd87b (diff)
gbuild: split uwinapi out of gb_STDLIBS
Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7
-rw-r--r--Library_merged.mk1
-rw-r--r--UnoControls/Library_ctl.mk1
-rw-r--r--accessibility/Library_acc.mk1
-rw-r--r--accessibility/Library_java_uno_accessbridge.mk1
-rw-r--r--animations/Library_animcore.mk1
-rw-r--r--avmedia/Library_avmedia.mk1
-rw-r--r--avmedia/Library_avmediaQuickTime.mk1
-rw-r--r--avmedia/Library_avmediagst.mk1
-rw-r--r--avmedia/Library_avmediagst_0_10.mk1
-rw-r--r--avmedia/Library_avmediawin.mk1
-rw-r--r--basctl/Library_basctl.mk1
-rw-r--r--basebmp/CppunitTest_basebmp.mk1
-rw-r--r--basebmp/Library_basebmp.mk1
-rw-r--r--basebmp/StaticLibrary_basebmp.mk1
-rw-r--r--basegfx/CppunitTest_basegfx.mk1
-rw-r--r--basegfx/Library_basegfx.mk1
-rw-r--r--basic/CppunitTest_basic_enable.mk1
-rw-r--r--basic/CppunitTest_basic_nested_struct.mk1
-rw-r--r--basic/CppunitTest_basic_scanner.mk1
-rw-r--r--basic/Library_sb.mk1
-rw-r--r--bean/Library_officebean.mk1
-rw-r--r--binaryurp/CppunitTest_binaryurp_test-cache.mk1
-rw-r--r--binaryurp/CppunitTest_binaryurp_test-unmarshal.mk1
-rw-r--r--binaryurp/Library_binaryurp.mk1
-rw-r--r--bridges/Library_java_uno.mk1
-rw-r--r--canvas/Library_cairocanvas.mk1
-rw-r--r--canvas/Library_canvasfactory.mk1
-rw-r--r--canvas/Library_canvastools.mk1
-rw-r--r--canvas/Library_directx9canvas.mk1
-rw-r--r--canvas/Library_gdipluscanvas.mk1
-rw-r--r--canvas/Library_nullcanvas.mk1
-rw-r--r--canvas/Library_simplecanvas.mk1
-rw-r--r--canvas/Library_vclcanvas.mk1
-rw-r--r--chart2/Library_chartcontroller.mk1
-rw-r--r--chart2/Library_chartcore.mk1
-rw-r--r--cli_ure/Executable_climaker.mk1
-rw-r--r--comphelper/CppunitTest_comphelper_test.mk1
-rw-r--r--comphelper/Library_comphelper.mk1
-rw-r--r--configmgr/Library_configmgr.mk1
-rw-r--r--connectivity/Library_ado.mk1
-rw-r--r--connectivity/Library_calc.mk1
-rw-r--r--connectivity/Library_dbase.mk1
-rw-r--r--connectivity/Library_dbpool2.mk1
-rw-r--r--connectivity/Library_dbtools.mk1
-rw-r--r--connectivity/Library_evoab.mk1
-rw-r--r--connectivity/Library_file.mk1
-rw-r--r--connectivity/Library_flat.mk1
-rw-r--r--connectivity/Library_hsqldb.mk1
-rw-r--r--connectivity/Library_jdbc.mk1
-rw-r--r--connectivity/Library_mork.mk1
-rw-r--r--connectivity/Library_mozab.mk1
-rw-r--r--connectivity/Library_mozabdrv.mk1
-rw-r--r--connectivity/Library_mozbootstrap.mk1
-rw-r--r--connectivity/Library_mysql.mk1
-rw-r--r--connectivity/Library_odbc.mk1
-rw-r--r--connectivity/Library_odbcbase.mk1
-rw-r--r--connectivity/Library_postgresql-sdbc-impl.mk1
-rw-r--r--connectivity/Library_postgresql-sdbc.mk1
-rw-r--r--connectivity/Library_sdbc2.mk1
-rw-r--r--cppcanvas/Library_cppcanvas.mk1
-rw-r--r--cppcanvas/Library_mtfrenderer.mk1
-rw-r--r--cppu/CppunitTest_cppu_checkapi.mk1
-rw-r--r--cppu/CppunitTest_cppu_qa_any.mk1
-rw-r--r--cppu/CppunitTest_cppu_qa_recursion.mk1
-rw-r--r--cppu/CppunitTest_cppu_qa_reference.mk1
-rw-r--r--cppu/CppunitTest_cppu_qa_unotype.mk1
-rw-r--r--cppu/CppunitTest_cppu_test_cppumaker.mk1
-rw-r--r--cppu/Library_affine_uno.mk1
-rw-r--r--cppu/Library_cppu.mk1
-rw-r--r--cppu/Library_log_uno.mk1
-rw-r--r--cppu/Library_purpenvhelper.mk1
-rw-r--r--cppu/Library_unsafe_uno.mk1
-rw-r--r--cppuhelper/CppunitTest_cppuhelper_checkapi.mk1
-rw-r--r--cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk1
-rw-r--r--cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk1
-rw-r--r--cppuhelper/CppunitTest_cppuhelper_qa_weak.mk1
-rw-r--r--cppuhelper/Library_cppuhelper.mk1
-rw-r--r--cpputools/Executable_regcomp.mk1
-rw-r--r--cpputools/Executable_regsingleton.mk1
-rw-r--r--cpputools/Executable_uno.mk1
-rw-r--r--cui/Library_cui.mk1
-rw-r--r--dbaccess/CppunitTest_dbaccess_macros_test.mk1
-rw-r--r--dbaccess/Executable_odbcconfig.mk1
-rw-r--r--dbaccess/Library_dba.mk1
-rw-r--r--dbaccess/Library_dbaxml.mk1
-rw-r--r--dbaccess/Library_dbmm.mk1
-rw-r--r--dbaccess/Library_dbu.mk1
-rw-r--r--dbaccess/Library_sdbt.mk1
-rw-r--r--desktop/Executable_crashrep.com.mk1
-rw-r--r--desktop/Executable_officeloader.mk1
-rw-r--r--desktop/Executable_quickstart.mk1
-rw-r--r--desktop/Executable_sbase.mk1
-rw-r--r--desktop/Executable_scalc.mk1
-rw-r--r--desktop/Executable_sdraw.mk1
-rw-r--r--desktop/Executable_simpress.mk1
-rw-r--r--desktop/Executable_smath.mk1
-rw-r--r--desktop/Executable_soffice.bin.mk1
-rw-r--r--desktop/Executable_soffice.mk1
-rw-r--r--desktop/Executable_soffice_bin.mk1
-rw-r--r--desktop/Executable_sweb.mk1
-rw-r--r--desktop/Executable_swriter.mk1
-rw-r--r--desktop/Executable_unopkg.bin.mk1
-rw-r--r--desktop/Library_deployment.mk1
-rw-r--r--desktop/Library_deploymentgui.mk1
-rw-r--r--desktop/Library_deploymentmisc.mk1
-rw-r--r--desktop/Library_migrationoo2.mk1
-rw-r--r--desktop/Library_migrationoo3.mk1
-rw-r--r--desktop/Library_offacc.mk1
-rw-r--r--desktop/Library_sofficeapp.mk1
-rw-r--r--desktop/Library_spl.mk1
-rw-r--r--desktop/Library_unopkgapp.mk1
-rw-r--r--drawinglayer/Library_drawinglayer.mk1
-rw-r--r--dtrans/Library_dnd.mk1
-rw-r--r--dtrans/Library_dtrans.mk1
-rw-r--r--dtrans/Library_ftransl.mk1
-rw-r--r--dtrans/Library_mcnttype.mk1
-rw-r--r--dtrans/Library_sysdtrans.mk1
-rw-r--r--editeng/CppunitTest_editeng_borderline.mk1
-rw-r--r--editeng/CppunitTest_editeng_core.mk1
-rw-r--r--editeng/CppunitTest_editeng_lookuptree.mk1
-rw-r--r--editeng/Library_editeng.mk1
-rw-r--r--embeddedobj/Library_embobj.mk1
-rw-r--r--embeddedobj/Library_emboleobj.mk1
-rw-r--r--embedserv/Library_emser.mk1
-rw-r--r--embedserv/Library_inprocserv.mk1
-rw-r--r--eventattacher/Library_evtatt.mk1
-rw-r--r--extensions/CppunitTest_extensions_test_update.mk1
-rw-r--r--extensions/Library_abp.mk1
-rw-r--r--extensions/Library_bib.mk1
-rw-r--r--extensions/Library_dbp.mk1
-rw-r--r--extensions/Library_log.mk1
-rw-r--r--extensions/Library_pcr.mk1
-rw-r--r--extensions/Library_pl.mk1
-rw-r--r--extensions/Library_res.mk1
-rw-r--r--extensions/Library_scn.mk1
-rw-r--r--fileaccess/Library_fileacc.mk1
-rw-r--r--filter/CppunitTest_filter_pict_test.mk1
-rw-r--r--filter/CppunitTest_filter_tga_test.mk1
-rw-r--r--filter/CppunitTest_filter_tiff_test.mk1
-rw-r--r--filter/Executable_svg2odf.mk1
-rw-r--r--filter/Library_PptImporter.mk1
-rw-r--r--filter/Library_egi.mk1
-rw-r--r--filter/Library_eme.mk1
-rw-r--r--filter/Library_epb.mk1
-rw-r--r--filter/Library_epg.mk1
-rw-r--r--filter/Library_epp.mk1
-rw-r--r--filter/Library_eps.mk1
-rw-r--r--filter/Library_ept.mk1
-rw-r--r--filter/Library_era.mk1
-rw-r--r--filter/Library_eti.mk1
-rw-r--r--filter/Library_exp.mk1
-rw-r--r--filter/Library_filterconfig.mk1
-rw-r--r--filter/Library_flash.mk1
-rw-r--r--filter/Library_icd.mk1
-rw-r--r--filter/Library_icg.mk1
-rw-r--r--filter/Library_idx.mk1
-rw-r--r--filter/Library_ime.mk1
-rw-r--r--filter/Library_ipb.mk1
-rw-r--r--filter/Library_ipd.mk1
-rw-r--r--filter/Library_ips.mk1
-rw-r--r--filter/Library_ipt.mk1
-rw-r--r--filter/Library_ipx.mk1
-rw-r--r--filter/Library_ira.mk1
-rw-r--r--filter/Library_itg.mk1
-rw-r--r--filter/Library_iti.mk1
-rw-r--r--filter/Library_msfilter.mk1
-rw-r--r--filter/Library_odfflatxml.mk1
-rw-r--r--filter/Library_pdffilter.mk1
-rw-r--r--filter/Library_placeware.mk1
-rw-r--r--filter/Library_svgfilter.mk1
-rw-r--r--filter/Library_t602filter.mk1
-rw-r--r--filter/Library_textfd.mk1
-rw-r--r--filter/Library_xmlfa.mk1
-rw-r--r--filter/Library_xmlfd.mk1
-rw-r--r--filter/Library_xsltdlg.mk1
-rw-r--r--filter/Library_xsltfilter.mk3
-rw-r--r--forms/Library_frm.mk1
-rw-r--r--formula/Library_for.mk1
-rw-r--r--formula/Library_forui.mk1
-rw-r--r--fpicker/Library_fpicker.mk1
-rw-r--r--fpicker/Library_fps.mk1
-rw-r--r--fpicker/Library_fps_odma.mk1
-rw-r--r--fpicker/Library_fps_office.mk1
-rw-r--r--framework/Library_fwe.mk1
-rw-r--r--framework/Library_fwi.mk1
-rw-r--r--framework/Library_fwk.mk1
-rw-r--r--framework/Library_fwl.mk1
-rw-r--r--framework/Library_fwm.mk1
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk1
-rw-r--r--hwpfilter/Library_hwp.mk1
-rw-r--r--i18npool/CppunitTest_i18npool_test_breakiterator.mk1
-rw-r--r--i18npool/CppunitTest_i18npool_test_characterclassification.mk1
-rw-r--r--i18npool/CppunitTest_i18npool_test_languagetag.mk1
-rw-r--r--i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk1
-rw-r--r--i18npool/Executable_gencoll_rule.mk1
-rw-r--r--i18npool/Executable_genconv_dict.mk1
-rw-r--r--i18npool/Executable_gendict.mk1
-rw-r--r--i18npool/Executable_genindex_data.mk1
-rw-r--r--i18npool/Executable_saxparser.mk1
-rw-r--r--i18npool/Library_collator_data.mk1
-rw-r--r--i18npool/Library_dict_ja.mk1
-rw-r--r--i18npool/Library_dict_zh.mk1
-rw-r--r--i18npool/Library_i18nisolang1.mk1
-rw-r--r--i18npool/Library_i18npool.mk1
-rw-r--r--i18npool/Library_i18nsearch.mk1
-rw-r--r--i18npool/Library_index_data.mk1
-rw-r--r--i18npool/Library_localedata_en.mk1
-rw-r--r--i18npool/Library_localedata_es.mk1
-rw-r--r--i18npool/Library_localedata_euro.mk1
-rw-r--r--i18npool/Library_localedata_others.mk1
-rw-r--r--i18npool/Library_textconv_dict.mk1
-rw-r--r--i18nutil/Library_i18nutil.mk1
-rw-r--r--idl/Executable_svidl.mk1
-rw-r--r--io/Library_acceptor.mk1
-rw-r--r--io/Library_connector.mk1
-rw-r--r--io/Library_streams.mk1
-rw-r--r--io/Library_textinstream.mk1
-rw-r--r--io/Library_textoutstream.mk1
-rw-r--r--javaunohelper/Library_juh.mk1
-rw-r--r--javaunohelper/Library_juhx.mk1
-rw-r--r--jurt/Library_jpipe.mk1
-rw-r--r--jurt/Library_jpipx.mk1
-rw-r--r--jvmaccess/Library_jvmaccess.mk1
-rw-r--r--jvmfwk/Executable_javaldx.mk1
-rw-r--r--jvmfwk/Library_jvmfwk.mk1
-rw-r--r--jvmfwk/Library_sunjavaplugin.mk1
-rw-r--r--l10ntools/Executable_ulfconv.mk1
-rw-r--r--lingucomponent/Library_guesslang.mk3
-rw-r--r--lingucomponent/Library_hyphen.mk3
-rw-r--r--lingucomponent/Library_lnth.mk3
-rw-r--r--lingucomponent/Library_spell.mk3
-rw-r--r--linguistic/Library_lng.mk1
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk1
-rw-r--r--lotuswordpro/Library_lwpft.mk1
-rw-r--r--o3tl/CppunitTest_o3tl_tests.mk1
-rw-r--r--officecfg/CppunitTest_officecfg_cppheader_test.mk1
-rw-r--r--oox/Library_oox.mk1
-rw-r--r--package/Library_package2.mk1
-rw-r--r--package/Library_xstor.mk1
-rw-r--r--padmin/Executable_spadmin.bin.mk1
-rw-r--r--padmin/Library_spa.mk1
-rw-r--r--regexp/Library_regexp.mk1
-rw-r--r--registry/Library_reg.mk1
-rw-r--r--remotebridges/Library_uuresolver.mk1
-rw-r--r--reportdesign/Library_rpt.mk1
-rw-r--r--reportdesign/Library_rptui.mk1
-rw-r--r--reportdesign/Library_rptxml.mk1
-rw-r--r--rsc/Executable_rsc.mk1
-rw-r--r--sal/CppunitTest_Module_DLL.mk1
-rw-r--r--sal/CppunitTest_sal_bytesequence.mk1
-rw-r--r--sal/CppunitTest_sal_checkapi.mk1
-rw-r--r--sal/CppunitTest_sal_osl_condition.mk1
-rw-r--r--sal/CppunitTest_sal_osl_file.mk1
-rw-r--r--sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk1
-rw-r--r--sal/CppunitTest_sal_osl_module.mk1
-rw-r--r--sal/CppunitTest_sal_osl_mutex.mk1
-rw-r--r--sal/CppunitTest_sal_osl_old_test_file.mk1
-rw-r--r--sal/CppunitTest_sal_osl_pipe.mk1
-rw-r--r--sal/CppunitTest_sal_osl_process.mk1
-rw-r--r--sal/CppunitTest_sal_osl_profile.mk1
-rw-r--r--sal/CppunitTest_sal_osl_security.mk1
-rw-r--r--sal/CppunitTest_sal_osl_setthreadname.mk1
-rw-r--r--sal/CppunitTest_sal_osl_thread.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_alloc.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_cipher.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_crc32.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_doublelock.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_locale.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_math.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_ostringbuffer.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_oustringbuffer.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_strings.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_uri.mk1
-rw-r--r--sal/CppunitTest_sal_rtl_uuid.mk1
-rw-r--r--sal/CppunitTest_sal_tcwf.mk1
-rw-r--r--sal/CppunitTest_sal_types.mk1
-rw-r--r--sal/Executable_cppunittester.mk1
-rw-r--r--sal/Executable_osl_process_child.mk1
-rw-r--r--sal/Library_sal.mk1
-rw-r--r--sal/Library_sal_textenc.mk1
-rw-r--r--salhelper/CppunitTest_salhelper_checkapi.mk1
-rw-r--r--salhelper/Library_salhelper.mk1
-rw-r--r--sax/CppunitTest_sax.mk1
-rw-r--r--sax/Library_expwrap.mk1
-rw-r--r--sax/Library_fastsax.mk1
-rw-r--r--sax/Library_sax.mk1
-rw-r--r--sc/CppunitTest_sc_annotationshapeobj.mk1
-rw-r--r--sc/CppunitTest_sc_cellrangeobj.mk1
-rw-r--r--sc/CppunitTest_sc_chart_regression_test.mk1
-rw-r--r--sc/CppunitTest_sc_databaserangeobj.mk1
-rw-r--r--sc/CppunitTest_sc_datapilotfieldobj.mk1
-rw-r--r--sc/CppunitTest_sc_datapilottableobj.mk1
-rw-r--r--sc/CppunitTest_sc_editfieldobj_cell.mk1
-rw-r--r--sc/CppunitTest_sc_editfieldobj_header.mk1
-rw-r--r--sc/CppunitTest_sc_filters_test.mk1
-rw-r--r--sc/CppunitTest_sc_macros_test.mk1
-rw-r--r--sc/CppunitTest_sc_modelobj.mk1
-rw-r--r--sc/CppunitTest_sc_namedrangeobj.mk1
-rw-r--r--sc/CppunitTest_sc_namedrangesobj.mk1
-rw-r--r--sc/CppunitTest_sc_rangelst_test.mk1
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk1
-rw-r--r--sc/CppunitTest_sc_tableautoformatfield.mk1
-rw-r--r--sc/CppunitTest_sc_tablesheetobj.mk1
-rw-r--r--sc/CppunitTest_sc_tablesheetsobj.mk1
-rw-r--r--sc/CppunitTest_sc_ucalc.mk1
-rw-r--r--sc/Library_sc.mk1
-rw-r--r--sc/Library_scd.mk1
-rw-r--r--sc/Library_scfilt.mk1
-rw-r--r--sc/Library_scui.mk1
-rw-r--r--sc/Library_vbaobj.mk1
-rw-r--r--scaddins/Library_analysis.mk1
-rw-r--r--scaddins/Library_date.mk1
-rw-r--r--sccomp/Library_solver.mk1
-rw-r--r--scripting/Library_basprov.mk1
-rw-r--r--scripting/Library_dlgprov.mk1
-rw-r--r--scripting/Library_protocolhandler.mk1
-rw-r--r--scripting/Library_scriptframe.mk1
-rw-r--r--scripting/Library_stringresource.mk1
-rw-r--r--scripting/Library_vbaevents.mk1
-rw-r--r--sd/CppunitTest_sd_filters_test.mk1
-rw-r--r--sd/CppunitTest_sd_regression_test.mk1
-rw-r--r--sd/CppunitTest_sd_uimpress.mk1
-rw-r--r--sd/Library_sd.mk1
-rw-r--r--sd/Library_sdd.mk1
-rw-r--r--sd/Library_sdfilt.mk1
-rw-r--r--sd/Library_sdui.mk1
-rw-r--r--sdext/CppunitTest_pdfimport.mk1
-rw-r--r--sfx2/CppunitTest_sfx2_metadatable.mk1
-rw-r--r--sfx2/Library_qstart.mk1
-rw-r--r--sfx2/Library_sfx.mk1
-rw-r--r--shell/Executable_lngconvex.mk1
-rw-r--r--shell/Library_cmdmail.mk1
-rw-r--r--shell/Library_desktopbe.mk1
-rw-r--r--shell/Library_localebe.mk1
-rw-r--r--shell/Library_recentfile.mk1
-rw-r--r--shell/Library_syssh.mk1
-rw-r--r--shell/Library_syssh_win.mk1
-rw-r--r--shell/Library_wininetbe.mk1
-rw-r--r--slideshow/CppunitTest_slideshow.mk1
-rw-r--r--slideshow/Executable_demoshow.mk1
-rw-r--r--slideshow/Library_OGLTrans.mk1
-rw-r--r--slideshow/Library_slideshow.mk1
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk1
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_MSC.mk1
-rw-r--r--solenv/gbuild/platform/windows.mk1
-rw-r--r--sot/CppunitTest_sot_test_sot.mk1
-rw-r--r--sot/Library_sot.mk1
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk1
-rw-r--r--starmath/Library_sm.mk1
-rw-r--r--starmath/Library_smd.mk1
-rw-r--r--stoc/Library_bootstrap.mk1
-rw-r--r--stoc/Library_introspection.mk1
-rw-r--r--stoc/Library_invocadapt.mk1
-rw-r--r--stoc/Library_invocation.mk1
-rw-r--r--stoc/Library_javaloader.mk1
-rw-r--r--stoc/Library_javavm.mk1
-rw-r--r--stoc/Library_namingservice.mk1
-rw-r--r--stoc/Library_proxyfac.mk1
-rw-r--r--stoc/Library_reflection.mk1
-rw-r--r--stoc/Library_stocservices.mk1
-rw-r--r--store/Library_store.mk1
-rw-r--r--svl/CppunitTest_svl_lngmisc.mk1
-rw-r--r--svl/CppunitTest_svl_urihelper.mk1
-rw-r--r--svl/Library_fsstorage.mk1
-rw-r--r--svl/Library_passwordcontainer.mk1
-rw-r--r--svl/Library_svl.mk1
-rw-r--r--svtools/CppunitTest_svtools_filters_test.mk1
-rw-r--r--svtools/Executable_bmp.mk1
-rw-r--r--svtools/Executable_bmpsum.mk1
-rw-r--r--svtools/Executable_g2g.mk1
-rw-r--r--svtools/Executable_langsupport.mk1
-rw-r--r--svtools/Library_hatchwindowfactory.mk1
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svx/Executable_gengal.bin.mk1
-rw-r--r--svx/Library_svx.mk1
-rw-r--r--svx/Library_svxcore.mk1
-rw-r--r--svx/Library_textconversiondlgs.mk1
-rw-r--r--sw/CppunitTest_sw_filters_test.mk1
-rw-r--r--sw/CppunitTest_sw_layout_test.mk1
-rw-r--r--sw/CppunitTest_sw_macros_test.mk1
-rw-r--r--sw/CppunitTest_sw_regression_test.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_odfexport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_odfimport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlexport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlimport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfexport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfimport.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8export.mk1
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8import.mk1
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk1
-rw-r--r--sw/Library_msword.mk1
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/Library_swd.mk1
-rw-r--r--sw/Library_swui.mk1
-rw-r--r--sw/Library_vbaswobj.mk1
-rw-r--r--test/Library_subsequenttest.mk1
-rw-r--r--test/Library_test.mk1
-rw-r--r--toolkit/Library_tk.mk1
-rw-r--r--tools/CppunitTest_tools_test.mk1
-rw-r--r--tools/Executable_bestreversemap.mk1
-rw-r--r--tools/Executable_mkunroll.mk1
-rw-r--r--tools/Executable_rscdep.mk1
-rw-r--r--tools/Executable_so_checksum.mk1
-rw-r--r--tools/Library_tl.mk1
-rw-r--r--tubes/CppunitTest_tubes_test.mk1
-rw-r--r--tubes/Library_tubes.mk3
-rw-r--r--ucb/Library_cached1.mk1
-rw-r--r--ucb/Library_srtrs1.mk1
-rw-r--r--ucb/Library_ucb1.mk1
-rw-r--r--ucb/Library_ucpcmis1.mk1
-rw-r--r--ucb/Library_ucpdav1.mk1
-rw-r--r--ucb/Library_ucpexpand1.mk1
-rw-r--r--ucb/Library_ucpext.mk1
-rw-r--r--ucb/Library_ucpfile1.mk1
-rw-r--r--ucb/Library_ucpftp1.mk1
-rw-r--r--ucb/Library_ucphier1.mk1
-rw-r--r--ucb/Library_ucpodma1.mk1
-rw-r--r--ucb/Library_ucppkg1.mk1
-rw-r--r--ucb/Library_ucptdoc1.mk1
-rw-r--r--ucbhelper/Library_ucbhelper.mk1
-rw-r--r--unotest/Library_unobootstrapprotector.mk1
-rw-r--r--unotest/Library_unoexceptionprotector.mk1
-rw-r--r--unotest/Library_unotest.mk1
-rw-r--r--unotools/Library_utl.mk1
-rw-r--r--unoxml/Library_unordf.mk1
-rw-r--r--unoxml/Library_unoxml.mk1
-rw-r--r--uui/Library_uui.mk1
-rw-r--r--vbahelper/Library_msforms.mk1
-rw-r--r--vbahelper/Library_vbahelper.mk1
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--writerfilter/CppunitTest_writerfilter_doctok.mk1
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk1
-rw-r--r--writerfilter/Library_writerfilter.mk1
-rw-r--r--writerfilter/Library_writerfilter_uno.mk1
-rw-r--r--writerperfect/Library_wpftdraw.mk1
-rw-r--r--writerperfect/Library_wpftwriter.mk1
-rw-r--r--xmloff/Library_xo.mk1
-rw-r--r--xmloff/Library_xof.mk1
-rw-r--r--xmlreader/Library_xmlreader.mk1
-rw-r--r--xmlscript/Library_xmlscript.mk1
-rw-r--r--xmlsecurity/CppunitTest_qa_certext.mk1
-rw-r--r--xmlsecurity/Library_xmlsecurity.mk1
-rw-r--r--xmlsecurity/Library_xsec_fw.mk1
-rw-r--r--xmlsecurity/Library_xsec_xmlsec.mk1
444 files changed, 448 insertions, 8 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index c08fb9f1c7ec..0c6cb408fd46 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
tl \
ucbhelper \
xmlreader \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index 0727c5f2780e..e5ac6d72ce4e 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,ctl,\
cppuhelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 9693ddf8e151..7da687e3695c 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,acc,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index 40f209fe2966..5e0b98fad2ee 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
salhelper \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 013704d37a68..370e1855a9ba 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,animcore,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 03f0441d7ac7..2eed8e188686 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 3b40326dc954..4f367776207d 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
sal \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 528960bfa1b1..20261158c4b1 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
sal \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 84b5ad469ac8..dace38183760 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
sal \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 9bca5f1fa89a..3eb9fe2e4962 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 3e7db4cd7da8..f83840635926 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
ucbhelper \
vcl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index f11b46297e30..fc7275a64801 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -27,6 +27,7 @@ endif
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basegfx \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 95230ba646a5..661f5aa2bd22 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_external,basebmp,vigra_headers))
$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk
index 07f4f0359dd3..25b923df532b 100644
--- a/basebmp/StaticLibrary_basebmp.mk
+++ b/basebmp/StaticLibrary_basebmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_StaticLibrary_use_external,basebmp,vigra_headers))
$(eval $(call gb_StaticLibrary_use_libraries,basebmp,\
basegfx \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 8b72a3782ad1..121faf6af57c 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 60f81a815ca6..e3b11aecfd97 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 76a9ecd02664..3bd2bc87337a 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
vcl \
xmlscript \
test \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index 098840c5cd54..fcadba3b0c84 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
vcl \
xmlscript \
test \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index 1c248b6f95d7..af058148e32f 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
utl \
vcl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index fa0e8201e941..de50d0c70f9f 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
utl \
vcl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 8cafec328542..78cc7dba7297 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -48,6 +48,7 @@ ifeq ($(GUI),WNT)
$(eval $(call gb_Library_use_libraries,officebean,\
jawt \
+ $(gb_UWINAPI) \
))
else
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index 8e7a441d5614..7818b21b9163 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index 57036ed59c82..2c8c907fa7e1 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index 2b936fb85d1d..879025b84606 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk
index 2d6f59579108..3bee8a12e679 100644
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
jvmaccess \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 9f59fef1e4e8..74ded07486cf 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
tl \
i18nisolang1 \
canvastools \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 8ee787685098..974231a039a1 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 156608221eda..4e70f654c6ad 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
tk \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 1a01475e263e..08ffdf4017fe 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
tl \
utl \
i18nisolang1 \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index da8ffa62552a..6ae93a809466 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
tl \
utl \
i18nisolang1 \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 689bd7eef377..a130dfb39fbe 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\
cppuhelper \
sal \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 470a99314db3..d5edd33bbfbe 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 911858385b44..922e5ca45dfc 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
tk \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 7a0ea6fdbcb9..3baaee9b5713 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index fe63ec80c010..6ca04479fad0 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk
index 9e67d66a1a26..bdea302bb619 100644
--- a/cli_ure/Executable_climaker.mk
+++ b/cli_ure/Executable_climaker.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_use_libraries,climaker,\
,msvcmrt \
) \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index 942539ba6b5d..f77cf84ee57c 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 76c75f1f2ee2..71d03cc9894c 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 68f9306f6991..588ddd819c86 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
sal \
salhelper \
xmlreader \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index d9d120f88594..4bd5d78cc247 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,ado,\
uuid \
dbtools \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 93431fcf3b4b..ffd3f71640fe 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,calc,\
dbtools \
file \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 5dd69321af53..68f4ea449d80 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\
file \
utl \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 127a3e7cfad9..e128c937ee41 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
dbtools \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index c82e568e780d..1cce1c6e246f 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
tl \
comphelper \
i18nisolang1 \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 882cdb0da054..78cf2d73957e 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,evoab,\
salhelper \
dbtools \
file \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 74186792ece6..8c21f99fed5e 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,file,\
dbtools \
utl \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index a69d0f221ae9..601f96f06b4f 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,flat,\
dbtools \
file \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index a3aef6d8906f..1ffd932298dd 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 70e553d0d3b8..704f050b6755 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
utl \
jvmfwk \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 9a73cd09b447..c2b95a0416db 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,mork, \
dbtools \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk
index afde265bf630..7872b26932db 100644
--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,mozab2,\
cppuhelper \
dbtools \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index b1c29ee0f811..0e4c541ea6c4 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
dbtools \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index aab40dcc030b..649f9907c06a 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 5e17042fd5e0..388af52f2263 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\
sal \
dbtools \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index d6c3dc547cf6..4b0e61baa48b 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 4d25b1c9fdd4..9655773afa00 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\
salhelper \
dbtools \
comphelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index b77f16c80702..439524882f8d 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index 202614dd52ff..7646af16ef12 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index eb8789caacd6..032937a81e6e 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
dbtools \
utl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 7b9ff2ff6557..283ad64dda71 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
svt \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index 4c4575d2763a..e86b99303fd4 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\
comphelper \
cppcanvas \
basegfx \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index 98832d086fb0..e68cc5cd5241 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
$(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
cppu \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 200abe92a144..04f33de964ba 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 9ff9af3c9bd6..671bd7f4eccf 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index a49d546d61c8..4eef2ae78385 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index 9e4619c1aac0..963ace47a15b 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index a3bb717dbdee..41da8e269314 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \
$(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index 68cf8d9b5b7c..2103eb49b77b 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,affine_uno))
$(eval $(call gb_Library_use_libraries,affine_uno,\
purpenvhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 3a2ed529b3dd..de47490923b5 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,cppu,\
$(eval $(call gb_Library_use_libraries,cppu,\
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index b0fa63ed720f..04d9b7d8d588 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,log_uno,\
cppu \
purpenvhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index db2a90e54909..05606523a758 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,purpenvhelper))
$(eval $(call gb_Library_use_libraries,purpenvhelper,\
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index be343aa2e99a..afeb4cc6af22 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,unsafe_uno))
$(eval $(call gb_Library_use_libraries,unsafe_uno,\
purpenvhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
index 60a66b6e9cf5..4369cfc2ea33 100644
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \
$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
cppuhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
index 3432a83797d8..726c220ff4ea 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
index 658afbcc0b56..2d6c943ecc30 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
index 455ea6d9ee20..391c13e4ac74 100644
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 964135bb9db0..705bd7cdc921 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
sal \
salhelper \
xmlreader \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
index 75653d01e4ee..4743fdef91ae 100644
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
index 0bc2a393d176..64892fd28696 100644
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index 252de3fc1a65..1b2a878951be 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index bfde9e1a75cf..3ed7c2508731 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index c35ebd5a5d14..6a28adaf748f 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 1e0f87eaa062..fb4a0d87211a 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
$(eval $(call gb_Library_use_sdk_api,odbcconfig))
$(eval $(call gb_Executable_use_libraries,odbcconfig,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index e32b93dca420..863bcbbaba5e 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,dba,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index e8b063a7b6c2..0d38f503aa85 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 393349f93364..89d9c0e83920 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
utl \
vcl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 80d32b19ccff..7e0fe1cfaa15 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 3e5aca5e54ce..ee61c037f875 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 96ed6f76cc60..d75f80614d29 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
))
$(eval $(call gb_Executable_use_libraries,crashrep_com,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index e3a766f2dd27..08c413a53387 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
$(eval $(call gb_Executable_use_libraries,officeloader,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index b3fbde1eaaf1..8500b1decd4a 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\
ole32 \
oleaut32 \
shell32 \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 375cba33385f..7a517aa8f06e 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
))
$(eval $(call gb_Executable_use_libraries,sbase,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index ce90099a532b..7ba226e06146 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
))
$(eval $(call gb_Executable_use_libraries,scalc,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 4642445173b4..558b8d340a8b 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
))
$(eval $(call gb_Executable_use_libraries,sdraw,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index c3026435e3f4..66002ce86f4f 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
))
$(eval $(call gb_Executable_use_libraries,simpress,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 4c7c4afb8232..3315f718b1e5 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
))
$(eval $(call gb_Executable_use_libraries,smath,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index d1c6aec55939..126f728cea36 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\
$(eval $(call gb_Executable_use_libraries,soffice.bin,\
sal \
sofficeapp \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 18efbbdf8770..17ac2d07cd8d 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\
advapi32 \
shell32 \
shlwapi \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index e87b8a041d2b..efddda2f1fc0 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\
$(eval $(call gb_Executable_use_libraries,soffice_bin,\
sal \
sofficeapp \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 870cf7d6c86a..1a62d5db772e 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
))
$(eval $(call gb_Executable_use_libraries,sweb,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index acd299b641ca..68047ecdac1d 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\
))
$(eval $(call gb_Executable_use_libraries,swriter,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 9303eefeefb1..ab71f1d1a56d 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\
sal \
tl \
unopkgapp \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 3910fb910757..f5fb20e062f0 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
ucbhelper \
utl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index f5f48e47d118..865add0e01a3 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 72ac02bd7c2a..93f66de60f26 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
ucbhelper \
utl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 838b475da267..3187188728af 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index d39497e32ea3..fd7201f4321c 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index f75728dab7bc..18653a3fca65 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 9e4fa379374b..ea039d4a8f8a 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 0d45c5991078..a950d31438c1 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,spl,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 081fee923a33..0d6222ab0e3d 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 41c75093f599..518fe885b45c 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\
tk \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 8331586779a3..dd15f23d33c0 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,dnd,\
shell32 \
uuid \
uwinapi \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index 79f18d82dfed..307bf030d865 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,dtrans,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 1b9e8735aef9..83d91bb76066 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,ftransl,\
ole32 \
sal \
uwinapi \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 04ae079e6672..80ad2bd23525 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 1b87a60417c5..ef358cf7c40f 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\
shell32 \
uuid \
uwinapi \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 368073ce0966..32eea423ea6c 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \
salhelper \
i18nisolang1 \
i18nutil \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index 90117c8d386d..cc12b6df0e4a 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index a69999ee235a..8911f87d8cec 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \
salhelper \
i18nisolang1 \
i18nutil \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 91f7e4a53cfc..f65f2eb1d35b 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -151,6 +151,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\
salhelper \
i18nisolang1 \
i18nutil \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 58e3f02a74af..d4e57c034fa0 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 97801d9bc798..3b280bc8e33a 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 8628a05af104..50a80d613b45 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,emser,\
oleaut32 \
sal \
uuid \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index 85ee9dac95c3..256871f62686 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\
gdi32 \
ole32 \
uuid \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk
index 02363a0e81b2..06eb7948e832 100644
--- a/eventattacher/Library_evtatt.mk
+++ b/eventattacher/Library_evtatt.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,evtatt,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index b59d5ca32b70..ad617f690582 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
sal \
test \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 92f0848491cb..708d89f5a7b6 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,abp,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 5ce36cddc0de..aa4e368942a4 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,bib,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index cb52f4d32e6f..1f9c76917c72 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_libraries,dbp,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 4e7e0d0f6be3..9fd561c884db 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,log,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 3504126847ef..847ba21c5604 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,pcr,\
cppu \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index c1451f8c3519..e6c5f0d7e1cf 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_Library_use_libraries,pl,\
cppu \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index bc3de6021b89..cd7bc522b424 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,res,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 4dd0044941c8..7cca92e09eed 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,scn,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 2b44b1618cc1..ea8336544d78 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fileacc,\
tl \
ucbhelper \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index 59a3244824e9..20cbe8613239 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
tl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index b8e1e3d04f76..fc05c5b68ac8 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
tl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 7f0852f6d568..4da2def1178f 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
tl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index 8f1fb73e6782..bc22022a7d9a 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index abd5af774dc4..dc676fc1eb04 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index d7537892529c..76f996ec5a5b 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,egi,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index efd589924959..fc67818d2918 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eme,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index 63f630c3c1df..d9ab41e401d0 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epb,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 51666771c8f9..dd5aba2718e6 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epg,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index 83469263cd83..545522dae843 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,epp,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index 2ba9b40a7051..a1d80c7c8605 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,eps,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index c1d9267ec555..2c8f8a406742 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,ept,\
basegfx \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index 5035ab350a7f..9c37c67e6b6b 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,era,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 3d634045ecf1..e1f3eefe6b40 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,eti,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index b447fdbf4134..8c2c06a8d136 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,exp,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 3dd322a7ad69..b6404a177ba9 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\
cppu \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 77668e02bd38..808f7a57172f 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,flash,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index e38f7451fbf7..bee43bbe7ceb 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,icd,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 0e319abf9ec3..7d9241fe9e2e 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,icg,\
tl \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index 62fb96d71d40..6040d65538d2 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,idx,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index 65927bb255b2..d93303030f58 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ime,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index 281d832bfa08..813954141b66 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipb,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index c81aeb264354..6f87872d92eb 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipd,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index 19a908e0f1a1..face1d7f1fb3 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ips,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 5924518751b2..768af3940040 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,ipt,\
tl \
basegfx \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index 8382b1aec39d..5cea98191964 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ipx,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 31d689cda70c..914c53e19cfd 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,ira,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index 5ce1c045892a..2a9a03e15f1f 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,itg,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index 85a4ac75354d..e736ffafe2e0 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,iti,\
vcl \
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index c7eebae6df41..0de501dfeb09 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,msfilter,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index a3d28afe39e2..3df371a63c8c 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 46e9973c4e4e..77be3737a741 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 4bb4ef1d29d3..e4d6684a26c1 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,placeware,\
cppu \
sal \
sax \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index f2927556848f..886882cf18fe 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index 8bf24468a019..082601caf7e0 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,t602filter,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index 9ab5a7c45572..594ce61f7456 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,textfd,\
cppu \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index f9260d57f8c2..acb109aee92e 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index 19f0509f44fa..b42e79ee2c70 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index ba4f0435ea5b..805e0e71f3cb 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 94fca8145310..293c28b0af20 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -35,8 +35,9 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\
ucbhelper \
cppuhelper \
cppu \
+ salhelper \
sal \
- salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 126bc5f339f2..2b4361fde1ca 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,frm,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index ce93f1695e7a..4678e9f4aeda 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,for,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 5aaea81d65b7..3090ed411160 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,forui,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
index 780a28a4fd88..fdba80e5e721 100644
--- a/fpicker/Library_fpicker.mk
+++ b/fpicker/Library_fpicker.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,fpicker,\
svl \
svt \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 431fc279fe00..95e315743eca 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,fps,\
oleaut32 \
shell32 \
uuid \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
index 1eae7a8585f9..08eff663bfac 100644
--- a/fpicker/Library_fps_odma.mk
+++ b/fpicker/Library_fps_odma.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index fb48ef2edda7..2db54954bdeb 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 5c87ddb46812..3d3598c6d1c2 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,fwe,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 5d51f55caa4f..b33194267453 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwi,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index b312d88dad76..348812634bbf 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 155af1aec42d..f02de16d2026 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index 5043a3d121d1..bd656521ea40 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,fwm,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index aa5903bd8317..834c9ae1212a 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \
sal \
test \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 1fa67d21d2d7..612a124e7ccd 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,hwp,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 3a7855d8e3f4..0fe4577ecff0 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\
cppuhelper \
sal \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
index b4e0a81cd826..9c6b549da697 100644
--- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification
cppuhelper \
sal \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk
index fd7c6047644d..cdb846894122 100644
--- a/i18npool/CppunitTest_i18npool_test_languagetag.mk
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
index 68e5076099c6..a2ea6f51430e 100644
--- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
+++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\
cppuhelper \
sal \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
index b1d0bd46b1a4..5999b06466b8 100644
--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\
$(eval $(call gb_Executable_use_libraries,gencoll_rule,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
index 85a49b15e655..58a3011afb16 100644
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\
$(eval $(call gb_Executable_use_libraries,genconv_dict,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index 3941b10a09f0..a49f2eb4c726 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,gendict,\
$(eval $(call gb_Executable_use_libraries,gendict,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 3665f44e9aec..c1279d00964b 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\
$(eval $(call gb_Executable_use_libraries,genindex_data,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index 5e61b3280270..eb4efdf838a7 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
index bd6ee6048f1c..507a3455c9b6 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Library_Library,collator_data))
$(eval $(call gb_Library_use_libraries,collator_data,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk
index 89784694b4f7..658d8334cf6c 100644
--- a/i18npool/Library_dict_ja.mk
+++ b/i18npool/Library_dict_ja.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Library_Library,dict_ja))
$(eval $(call gb_Library_use_libraries,dict_ja,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk
index 2a910e502136..c21addb7f2cb 100644
--- a/i18npool/Library_dict_zh.mk
+++ b/i18npool/Library_dict_zh.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Library_Library,dict_zh))
$(eval $(call gb_Library_use_libraries,dict_zh,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 72134c2d87b5..4ff6fff4331a 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\
$(eval $(call gb_Library_use_libraries,i18nisolang1,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index bdd0fd66087a..73d38e954cb3 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\
i18nisolang1 \
i18nutil \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index bfe6450c5899..b55f8cdfe731 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\
cppuhelper \
i18nregexp \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index 9a7270c82c1f..c5bf1f4004ac 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Library_Library,index_data))
$(eval $(call gb_Library_use_libraries,index_data,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index fe944a792350..4cd77fc77448 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -29,6 +29,7 @@
$(eval $(call gb_Library_Library,localedata_en))
$(eval $(call gb_Library_use_libraries,localedata_en,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index 0d8f1ea77283..145123225e2c 100644
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es))
$(eval $(call gb_Library_use_libraries,localedata_es,\
localedata_en \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index 96a823e3efd0..c1b4569d01d9 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro))
$(eval $(call gb_Library_use_libraries,localedata_euro,\
localedata_en \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index 08f38bf1c775..d331b8906506 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others))
$(eval $(call gb_Library_use_libraries,localedata_others,\
localedata_en \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index e98a4525bf6f..e274c549e850 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\
$(eval $(call gb_Library_use_sdk_api,textconv_dict))
$(eval $(call gb_Library_use_libraries,textconv_dict,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk
index 84f33c0451b9..b9cbbdcc151e 100644
--- a/i18nutil/Library_i18nutil.mk
+++ b/i18nutil/Library_i18nutil.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\
comphelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 4eb371c60c88..bdf0aa40e124 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_sdk_api,svidl))
$(eval $(call gb_Executable_use_libraries,svidl,\
tl \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index 80062249654c..a07da5d58765 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,acceptor,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index c2147e7d3f31..2bbe7257e922 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,connector,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 696bc4716c77..bb79154ff61a 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,streams,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk
index d9c67a245fc1..b921a206792d 100644
--- a/io/Library_textinstream.mk
+++ b/io/Library_textinstream.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textinstream,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk
index 0fdaf7ffd9c9..17fe1ec591a3 100644
--- a/io/Library_textoutstream.mk
+++ b/io/Library_textoutstream.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index 13364691be1a..ecacfd9978d0 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\
$(eval $(call gb_Library_use_libraries,juh,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
index 7f1f604e7f1b..ce8ac747934e 100644
--- a/javaunohelper/Library_juhx.mk
+++ b/javaunohelper/Library_juhx.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,juhx,\
jvmaccess \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 16707557f8f7..eb9656737b3a 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -28,6 +28,7 @@
$(eval $(call gb_Library_Library,jpipe))
$(eval $(call gb_Library_use_libraries,jpipe,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk
index 21087c2d291f..c36dce20b949 100644
--- a/jurt/Library_jpipx.mk
+++ b/jurt/Library_jpipx.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,jpipx))
$(eval $(call gb_Library_use_libraries,jpipx,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index d4227a78c259..2a957ee006ce 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\
cppu \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk
index 9f5e080d6c81..177947cd0b15 100644
--- a/jvmfwk/Executable_javaldx.mk
+++ b/jvmfwk/Executable_javaldx.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_Executable,javaldx))
$(eval $(call gb_Executable_use_libraries,javaldx,\
jvmfwk \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 4dc9c092e792..c4a459728324 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_api,jvmfwk,\
$(eval $(call gb_Library_use_libraries,jvmfwk,\
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 694cecc31fdf..517892fa8e8e 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk
index 8ed5bb0e5f2c..7a92c2edd596 100644
--- a/l10ntools/Executable_ulfconv.mk
+++ b/l10ntools/Executable_ulfconv.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Executable_Executable,ulfconv))
$(eval $(call gb_Executable_use_libraries,ulfconv,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index a2e3ad8bbbc3..bfd8ffa7a805 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -32,12 +32,13 @@ $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/langu
$(eval $(call gb_Library_use_sdk_api,guesslang))
$(eval $(call gb_Library_use_libraries,guesslang,\
- $(gb_STDLIBS) \
cppu \
cppuhelper \
sal \
tl \
utl \
+ $(gb_UWINAPI) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,guesslang,\
diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index 1fd9e79aaa61..ce28dd9e9b67 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,hyphen,\
$(eval $(call gb_Library_use_sdk_api,hyphen))
$(eval $(call gb_Library_use_libraries,hyphen,\
- $(gb_STDLIBS) \
cppu \
cppuhelper \
i18nisolang1 \
@@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,hyphen,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,hyphen,\
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index a406d83ada5b..96a57d04e246 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,lnth,\
$(eval $(call gb_Library_use_sdk_api,lnth))
$(eval $(call gb_Library_use_libraries,lnth,\
- $(gb_STDLIBS) \
comphelper \
cppu \
cppuhelper \
@@ -46,6 +45,8 @@ $(eval $(call gb_Library_use_libraries,lnth,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,lnth,\
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index a9349e089ca6..2868b3e0d8ce 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,spell,\
$(eval $(call gb_Library_use_sdk_api,spell))
$(eval $(call gb_Library_use_libraries,spell,\
- $(gb_STDLIBS) \
cppu \
cppuhelper \
i18nisolang1 \
@@ -45,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,spell,\
sal \
tl \
utl \
+ $(gb_UWINAPI) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_static_libraries,spell,\
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index d451348f460b..3e9900ba0f21 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,lng,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 3a089135415b..c96fbbcf148c 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \
test \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 5d6ffb2e99d1..676446b8fe42 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\
ucbhelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index 29e1ff8a6a1f..30de08e70d06 100644
--- a/o3tl/CppunitTest_o3tl_tests.mk
+++ b/o3tl/CppunitTest_o3tl_tests.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc))
$(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index 886888bc21c4..af41d6fdceb1 100644
--- a/officecfg/CppunitTest_officecfg_cppheader_test.mk
+++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk
@@ -30,6 +30,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test))
$(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 7c70c1821d45..56443e46671a 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,oox,\
vcl \
xo \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index e5b5023de7a8..a453af4a9a5b 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,package2,\
sal \
sax \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
index a91533f98f87..15c2cb47dd98 100644
--- a/package/Library_xstor.mk
+++ b/package/Library_xstor.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,xstor,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 04f301ed3844..3bcf1989c3bc 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index 7644c19fd99f..6ee2ef230ae6 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,spa,\
i18nisolang1 \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index e7714c4bddd3..1b3b73197f8f 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,i18nregexp,\
$(eval $(call gb_Library_use_libraries,i18nregexp,\
sal \
i18nutil \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 4dd10b76a895..2701c472dfd2 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,reg,\
$(eval $(call gb_Library_use_libraries,reg,\
sal \
store \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk
index a289b6499eca..d8079bac6860 100644
--- a/remotebridges/Library_uuresolver.mk
+++ b/remotebridges/Library_uuresolver.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index ae4318ffea52..300874c586d0 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 3755165032b1..4949dea74ea2 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index bdc3cdaeda02..c1ee286f9d65 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,rptxml,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 6382f8545a4b..25af0b595ea1 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_use_libraries,rsc,\
comphelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
index f74e84753a89..d2f5079723e3 100644
--- a/sal/CppunitTest_Module_DLL.mk
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\
$(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk
index 6ceb12af917c..cdb62c7e4334 100644
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ b/sal/CppunitTest_sal_bytesequence.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\
$(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index 280fd7306acb..8b7ca18c9339 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \
$(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk
index 9ea1a2a7c2e7..4c90de256844 100644
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ b/sal/CppunitTest_sal_osl_condition.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk
index ff46564c855e..dfd5d592f999 100644
--- a/sal/CppunitTest_sal_osl_file.mk
+++ b/sal/CppunitTest_sal_osl_file.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
index cfbb95d89e25..199f94cc3fc1 100644
--- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
+++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk
index d64498a561cc..7b75f8a3e0fc 100644
--- a/sal/CppunitTest_sal_osl_module.mk
+++ b/sal/CppunitTest_sal_osl_module.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk
index cfc92f5e3253..131761d1d078 100644
--- a/sal/CppunitTest_sal_osl_mutex.mk
+++ b/sal/CppunitTest_sal_osl_mutex.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk
index 0e92b707b972..3828b7784b9a 100644
--- a/sal/CppunitTest_sal_osl_old_test_file.mk
+++ b/sal/CppunitTest_sal_osl_old_test_file.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
index 8e6b5bfe796e..4aa70952531b 100644
--- a/sal/CppunitTest_sal_osl_pipe.mk
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
sal \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk
index 60c728ab40ff..6a53add92dae 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk
index 7eb2b9dc087a..1195b7d55eb1 100644
--- a/sal/CppunitTest_sal_osl_profile.mk
+++ b/sal/CppunitTest_sal_osl_profile.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk
index 1e2aac169e06..a583b7c423dc 100644
--- a/sal/CppunitTest_sal_osl_security.mk
+++ b/sal/CppunitTest_sal_osl_security.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk
index 69a350254365..6d6f8df52238 100644
--- a/sal/CppunitTest_sal_osl_setthreadname.mk
+++ b/sal/CppunitTest_sal_osl_setthreadname.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk
index 22fdb6831355..b014c83e46ba 100644
--- a/sal/CppunitTest_sal_osl_thread.mk
+++ b/sal/CppunitTest_sal_osl_thread.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk
index 5ed812526d60..e6a52823b2a9 100644
--- a/sal/CppunitTest_sal_rtl_alloc.mk
+++ b/sal/CppunitTest_sal_rtl_alloc.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk
index aee5f0fe1cb7..78cca6b7b39a 100644
--- a/sal/CppunitTest_sal_rtl_cipher.mk
+++ b/sal/CppunitTest_sal_rtl_cipher.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk
index 32da6ec443c6..1c5b6d19c71d 100644
--- a/sal/CppunitTest_sal_rtl_crc32.mk
+++ b/sal/CppunitTest_sal_rtl_crc32.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk
index aeaa91b4f588..9c11d796de49 100644
--- a/sal/CppunitTest_sal_rtl_doublelock.mk
+++ b/sal/CppunitTest_sal_rtl_doublelock.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk
index 96d11fe389e3..613251ef6c13 100644
--- a/sal/CppunitTest_sal_rtl_locale.mk
+++ b/sal/CppunitTest_sal_rtl_locale.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk
index 09856b7d686a..df570a552b0d 100644
--- a/sal/CppunitTest_sal_rtl_math.mk
+++ b/sal/CppunitTest_sal_rtl_math.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
index 721996298bb3..f0ea74c7ca97 100644
--- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
index 570717eb559b..f2384f709cdc 100644
--- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index 2762133e24f3..bdab2fb48987 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 1da1b1b55bb6..69e701b794ab 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk
index 9a92af246696..8be994595e1f 100644
--- a/sal/CppunitTest_sal_rtl_uuid.mk
+++ b/sal/CppunitTest_sal_rtl_uuid.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\
$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk
index d96f57c688f3..7efbad135f36 100644
--- a/sal/CppunitTest_sal_tcwf.mk
+++ b/sal/CppunitTest_sal_tcwf.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
$(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk
index bc904e23c23e..720f5ee3cf0b 100644
--- a/sal/CppunitTest_sal_types.mk
+++ b/sal/CppunitTest_sal_types.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\
$(eval $(call gb_CppunitTest_use_libraries,sal_types,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index e9d4170b58fe..c8d8f4756222 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
$(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk
index 90548762fb52..d43400d6d86f 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Executable_Executable,osl_process_child))
$(eval $(call gb_Executable_use_libraries,osl_process_child,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 4da0e3b6653c..653aa0bdafad 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index 3ad5dbfb8832..94f69911cebc 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sal_textenc))
$(eval $(call gb_Library_use_libraries,sal_textenc,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk
index 92a876866f3e..6ebc52ef5b19 100644
--- a/salhelper/CppunitTest_salhelper_checkapi.mk
+++ b/salhelper/CppunitTest_salhelper_checkapi.mk
@@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \
$(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
index c9f7c8a1c49e..2787529cf2ae 100644
--- a/salhelper/Library_salhelper.mk
+++ b/salhelper/Library_salhelper.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_defs,salhelper,\
$(eval $(call gb_Library_use_libraries,salhelper,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index fd8fb5e9fd45..0e889e2418b1 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \
sal \
comphelper \
cppu \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 39b83b7c4816..6007467b11cc 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,expwrap,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index f87a22cc6656..b28b653e4bfd 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,fastsax,\
cppuhelper \
sal \
sax \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 3dc8942795a1..4c72db00051b 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_libraries,sax,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index d707bc8f33c9..a33164371afe 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index b6b71a0b4514..c91923061d58 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 7d67779ee0b4..c7fbb6731750 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 6c3f4a0c013c..b7d1fb6be404 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 6a4b89ba6897..f0788fb0fd6b 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 40e3f83df1eb..1636112f43b0 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 7b3e45b2696b..6e5fa7076955 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 56378223778c..7b47240e0138 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index ef47365af404..c61b4a2fbbf6 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 839c9e39c38b..a24f391b9c09 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 44ac9f51af3c..42a48f870730 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 666181118538..ff9ad582d92e 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 99a215dbebff..192bbbd70c08 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 67762d9e0c80..6933c2583da0 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index ecb4bf74bdca..982ec6e4b35a 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index ece36aae60c3..b72bb005305f 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index d904e745a830..2bacb8f2725c 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 1e097a02434f..c7b7fcd827cf 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 6710f8a523f7..3948bcfb04ec 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index bbbab8f84bb0..96cb69132a70 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,sc,\
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 6b74917f62f6..4c39cf1f40d3 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,scd,\
tl \
ucbhelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 8816bc3db13a..d38d40b97027 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 6d67de093be3..7f94c6193f5e 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,scui,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 37dfd24178ca..30eb16d059ff 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\
utl \
vbahelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 7a4c361f3a20..e1fe08c217b5 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,analysis,\
cppuhelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 57820806fc97..f224c80f7a8a 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,date,\
cppuhelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 2db18f5c22dd..42a4fa3d72e8 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,solver,\
cppuhelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index a71e3e61dcee..5debc0acd8e5 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,basprov,\
tl \
ucbhelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 7e91ed87d391..c9e3b2140e94 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\
vbahelper \
vcl \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index 35e47be7047a..d99f60fd4fe1 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\
sal \
sfx \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index ee5f420e9e08..86d6a05bc894 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\
sal \
tl \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index faca2a0f660c..eeb11a1c8668 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,stringresource,\
cppuhelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index 83ec86c505c7..45c35ff163ac 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\
sfx \
sb \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 439423076efb..99a19042cb21 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index af34ec512982..e0a5000359de 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index baba9fa72f95..5209b6445001 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 6eda34578214..b0535d506bbd 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
utl \
vcl \
xmlsecurity \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 68d6b6dd8b64..404ea819e63a 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,sdd,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 3250fbfa114b..2402116a33e2 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 35bdede5b41a..7fcf0b01bae2 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 26f6835e3a9b..1ea6bc6c22f1 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
sal \
test \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index ae2132d05915..6c1d68d8c189 100644
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sfx2_metadatable))
$(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \
sal \
sfx \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index ccd254c889f5..12c1812a96b4 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\
utl \
vcl \
sfx \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 3ed3a02ce483..5e01c7d01f70 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk
index edc88da25dbf..9ed4dd0f01e8 100644
--- a/shell/Executable_lngconvex.mk
+++ b/shell/Executable_lngconvex.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\
i18nisolang1 \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk
index 1b74fa595264..0ae262bee72c 100644
--- a/shell/Library_cmdmail.mk
+++ b/shell/Library_cmdmail.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk
index 90821f6c1822..fbc05a0e318c 100644
--- a/shell/Library_desktopbe.mk
+++ b/shell/Library_desktopbe.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk
index 02cdeb7835a1..008a00481008 100644
--- a/shell/Library_localebe.mk
+++ b/shell/Library_localebe.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,localebe1,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 758829962040..c6c25e89a5b2 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -46,6 +46,7 @@ endif
$(eval $(call gb_Library_use_libraries,recentfile,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 9a08ca481439..252aa827d7c4 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
index 61810d714142..481728a3c4a8 100644
--- a/shell/Library_syssh_win.mk
+++ b/shell/Library_syssh_win.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,syssh,\
ole32 \
sal \
shell32 \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk
index 9853c2cba6f6..d02c6cc5027b 100644
--- a/shell/Library_wininetbe.mk
+++ b/shell/Library_wininetbe.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index bf1c0b5cad5d..42be84b0d0f6 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index f658f7f1eb9c..86d14c4b3106 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\
tl \
ucbhelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 51e9bbdffe16..199699fd24cd 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
cppuhelper \
sal \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 68c940aa21ca..22b6f5d6bfd6 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 308200e6f613..a59782c6dd75 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -109,7 +109,6 @@ endif
gb_STDLIBS := \
mingwthrd \
mingw32 \
- uwinapi \
mingwex \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3e375ba4c142..9deca874330a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -188,7 +188,6 @@ gb_CXXFLAGS := \
-Zm500 \
gb_STDLIBS := \
- uwinapi \
advapi32 \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index f33029f83edf..4d019f80359f 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -38,5 +38,6 @@ gb_OSDEFS := \
-DWNT \
-DNOMINMAX \
+gb_UWINAPI := uwinapi
# vim:set noexpandtab:
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 22143e1b7bb6..da79a6556c8b 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \
sot \
tl \
unotest \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index ddb21b2ce9a6..50a80db23884 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,sot,\
tl \
ucbhelper \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 959d3d66f297..892af74daa71 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 17c6c7a6dd9a..2ecb8d8e7ed3 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,sm,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 86d4fb28f8ed..3ab12ab75593 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,smd,\
tl \
ucbhelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index 2676d47ae8e4..e1ef1806ae64 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\
sal \
salhelper \
xmlreader \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index d94330dec5b9..2f2f07d4c926 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,introspection,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index fc9cb7238964..38dd68b657f0 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 00288ebd3074..df8d3c78d468 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,invocation,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 816bb621674b..e0ff05a968df 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,javaloader,\
jvmaccess \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index edf394e16e29..d8b5b464f44e 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,javavm,\
jvmfwk \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index 10debb0abdbf..124bfaa3055c 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,namingservice,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index 6e13d58b761f..cf87b477597d 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 2d383e55619c..644f9f28f1b3 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,reflection,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index 02a9ecfb5eb2..8f4ec53dd618 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,stocservices,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/store/Library_store.mk b/store/Library_store.mk
index 804901c15e23..39029be71fe5 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_defs,store,\
$(eval $(call gb_Library_use_libraries,store,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index fd090143c092..c356f403a56b 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \
sal \
salhelper \
svl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 3586a42b29bd..b0cbcd0e6a35 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
svl \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index fc65cb13aa8a..86c00f45418f 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\
tl \
ucbhelper \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index b9d5dc0e2a09..1b89ea3ed3da 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\
comphelper \
ucbhelper \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 768f2db56a0f..8f7940d2b76b 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,svl,\
tl \
ucbhelper \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 96a1a8d551a4..65b4e1bea3ab 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
tl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 4a4ccb8bf8f4..f8fee180d891 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,bmp,\
comphelper \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index c341d4730ca9..a00b928bd39a 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\
comphelper \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index d3c5bd024d2f..0936abd454cf 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_use_libraries,g2g,\
svt \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk
index a16e12cda2eb..532b78bbecb6 100644
--- a/svtools/Executable_langsupport.mk
+++ b/svtools/Executable_langsupport.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\
tl \
ucbhelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 52ab67c58d82..1c7cb22309d7 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\
tk \
tl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index cfdadd9be371..7a2379b8c2cd 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,svt,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 7b06bad00624..11aad40f4d46 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
cppuhelper \
vcl \
svxcore \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a26c1c38e6a7..a939a086a82a 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
vcl \
xo \
xmlscript \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 89983fdd7966..f94e359aa6a6 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 50b5074adbb7..9b2fdff4b386 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 5a02e31872f9..47d7a35e3075 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 6d0b024ef5c5..080bd6aeb1d7 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index c8d94e795018..e42eb0c9276b 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index d4e28d66bc71..538542b37ef7 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
index a59be4022800..10e7ab20769f 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
unotest \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
index cba3ebd24779..aceaa697b7e6 100644
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
unotest \
vcl \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
index eafc644b6a5f..5a9587948a21 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
unotest \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index c06de2a849da..8fc2dfedecaa 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
unotest \
sw \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk
index fb787a3c4cea..1609b6f41ffc 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
unotest \
utl \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
index 3f4747c7cd7d..7ce087e36e40 100644
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
unotest \
vcl \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
index 4595de555c2b..9f4677b5b29e 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
utl \
sw \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
index 6e70c9ddad60..16c36843407a 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
test \
unotest \
sw \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 74bb52a7f834..8b53bdf32009 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 54bb731aee69..365c69096b96 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,msword,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1d1801345a5e..b58f71a72b3e 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,sw,\
vbahelper \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index a96018ee57b8..73f5fb857781 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,swd,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 86c7372b2eee..4de06513c59a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,swui,\
ucbhelper \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index e77dc7823d43..310a90f4dbff 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
utl \
vbahelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index aad5ebac3fb9..1eca2f36e502 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\
utl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/test/Library_test.mk b/test/Library_test.mk
index cea736feffa1..e730c8b944fa 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,test,\
utl \
unotest \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 72df762e19a9..0388f3cb62bd 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,tk,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index 13c663afc7cd..ba876eab4a8c 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,tools_test, \
$(eval $(call gb_CppunitTest_use_libraries,tools_test, \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk
index 4f12051d4d76..a30b5e5e0fe2 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\
$(eval $(call gb_Executable_use_libraries,bestreversemap,\
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 43d436ca9d6b..e97405bec6dc 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\
basegfx \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index c3d778335aef..12635cd3a7b5 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\
comphelper \
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index e384ad57f067..260607035582 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\
$(eval $(call gb_Executable_use_libraries,so_checksum,\
sal \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 23d534fa02c3..b588874d04ca 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,tl,\
i18nisolang1 \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index f60a1b0fd174..1a54526c9872 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \
sal \
tubes \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index 5ef4cb407980..b077841a25d6 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,tubes,\
))
$(eval $(call gb_Library_use_libraries,tubes,\
- $(gb_STDLIBS) \
comphelper \
cppu \
sal \
@@ -50,6 +49,8 @@ $(eval $(call gb_Library_use_libraries,tubes,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,tubes,\
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk
index 85b1fc29c596..93ac31c15548 100644
--- a/ucb/Library_cached1.mk
+++ b/ucb/Library_cached1.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,cached1,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index 7beb741e7465..c349e1cec703 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index a501f877a184..109cf2a55be6 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,ucb1,\
cppuhelper \
sal \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index 1fb12264652a..d7fac5b45f89 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\
salhelper \
ucbhelper \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 91b3a975c1ce..3f8e2f42cb0e 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index 51c79e703c5c..dda77b3e430a 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\
cppuhelper \
sal \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 9e730003d3e9..eb436aee0a6c 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpext,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk
index ed68c8938fb1..4f729b1dec08 100644
--- a/ucb/Library_ucpfile1.mk
+++ b/ucb/Library_ucpfile1.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\
cppuhelper \
sal \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index e588649e2f30..8b197d56b72c 100644
--- a/ucb/Library_ucpftp1.mk
+++ b/ucb/Library_ucpftp1.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\
cppuhelper \
sal \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index ac33d001c686..9d33231e23fa 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
index d531b5494fad..e67f9aa84660 100644
--- a/ucb/Library_ucpodma1.mk
+++ b/ucb/Library_ucpodma1.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk
index 8b0e8ec0fe12..f1212d0f629a 100644
--- a/ucb/Library_ucppkg1.mk
+++ b/ucb/Library_ucppkg1.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index 82b8aba0fc37..97c18b33505b 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\
sal \
salhelper \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index e5a61fd7a01b..f394025ac0f8 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\
cppuhelper \
sal \
salhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk
index 0119fbdea40a..4fba9a027607 100644
--- a/unotest/Library_unobootstrapprotector.mk
+++ b/unotest/Library_unobootstrapprotector.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index 1f5a584d11b6..f7d50c76a9b7 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index f4dd2222a007..809968835707 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,unotest,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 97e1d70f35fd..0b7eef7b73fb 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,utl,\
salhelper \
tl \
ucbhelper \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index efab7a8f62e8..f9395a83d160 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,unordf,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 81ecfef4f776..3dccdccaec18 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,unoxml,\
cppuhelper \
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index 87cff350a831..e9030b96fe6e 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,uui,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 1b0e56526cf7..9a5493c12cb8 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,msforms,\
tl \
vbahelper \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index a18f06e6a482..8bbe47457870 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 86435a2ba352..df68439c72c1 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
cppu \
sal \
xmlreader \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index fd2fe872b30f..cf48c49851cf 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \
cppuhelper \
sal \
writerfilter \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 6e583e9227f5..78f2a008abc6 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
unotest \
vcl \
writerfilter \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index c0088eac61f3..83006badc658 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\
tl \
utl \
vcl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 1eeccd538349..d7a72fc4c0c8 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\
cppuhelper \
sal \
writerfilter \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 57b48a045f54..412b0c982430 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\
tl \
utl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 25f77c40673c..a4295a5019b6 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
ucbhelper \
utl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 468f966a90f5..73be015cb824 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,xo,\
svl \
tl \
utl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 4efd62b0ff72..15e65da4c325 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,xof,\
salhelper \
sax \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index e254b197b22b..7035278e9c44 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_defs,xmlreader,\
$(eval $(call gb_Library_use_libraries,xmlreader,\
cppu \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
# cppu is only needed due to the cppumaker -C hack
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index 2ca986a385aa..3f83379ba8b3 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index 7fd7af10deb3..7501f23cc110 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\
svl \
test \
tl \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
index aae123bd8c47..09766bc188f4 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\
utl \
vcl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index 4ea0768b4d51..99b393f532de 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\
cppu \
cppuhelper \
sal \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index e2048f60454a..5195db72d41a 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
svl \
tl \
xo \
+ $(gb_UWINAPI) \
$(gb_STDLIBS) \
))