diff --git a/comphelper/StaticLibrary_windows_process.mk b/comphelper/StaticLibrary_windows_process.mk index 1b086eac952b..2ef95e46a071 100644 --- a/comphelper/StaticLibrary_windows_process.mk +++ b/comphelper/StaticLibrary_windows_process.mk @@ -13,10 +13,6 @@ $(eval $(call gb_StaticLibrary_set_include,windows_process,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_defs,windows_process,\ - -DUNICODE \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\ comphelper/source/windows/windows_process \ )) diff --git a/desktop/Executable_minidump_upload.mk b/desktop/Executable_minidump_upload.mk index 959d4af8c7c1..ccdcc97e743d 100644 --- a/desktop/Executable_minidump_upload.mk +++ b/desktop/Executable_minidump_upload.mk @@ -14,10 +14,6 @@ $(eval $(call gb_Executable_use_libraries,minidump_upload,\ sal \ )) -$(eval $(call gb_Executable_add_defs,minidump_upload,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_use_external,minidump_upload,curl)) $(eval $(call gb_Executable_add_exception_objects,minidump_upload,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 4dd6be02a9ee..d3a4fafea810 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sbase)) $(eval $(call gb_Executable_set_targettype_gui,sbase,YES)) -$(eval $(call gb_Executable_add_defs,sbase,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,sbase,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index fc066770b945..1a21840a3306 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,scalc)) $(eval $(call gb_Executable_set_targettype_gui,scalc,YES)) -$(eval $(call gb_Executable_add_defs,scalc,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,scalc,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 1b12bb0f2467..c6fd96373de1 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sdraw)) $(eval $(call gb_Executable_set_targettype_gui,sdraw,YES)) -$(eval $(call gb_Executable_add_defs,sdraw,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,sdraw,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 7376b7bd3883..d06205486020 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,simpress)) $(eval $(call gb_Executable_set_targettype_gui,simpress,YES)) -$(eval $(call gb_Executable_add_defs,simpress,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,simpress,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 249f62223bfe..94aa8b915f30 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,smath)) $(eval $(call gb_Executable_set_targettype_gui,smath,YES)) -$(eval $(call gb_Executable_add_defs,smath,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,smath,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 0bbc83877742..72cd6357be8f 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sweb)) $(eval $(call gb_Executable_set_targettype_gui,sweb,YES)) -$(eval $(call gb_Executable_add_defs,sweb,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,sweb,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 6fbf9bd5057c..3f4859e23b88 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,swriter)) $(eval $(call gb_Executable_set_targettype_gui,swriter,YES)) -$(eval $(call gb_Executable_add_defs,swriter,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,swriter,\ /ENTRY:wWinMainCRTStartup \ )) diff --git a/desktop/StaticLibrary_winlauncher.mk b/desktop/StaticLibrary_winlauncher.mk index 46bed0de4c90..1fed934f1ba2 100644 --- a/desktop/StaticLibrary_winlauncher.mk +++ b/desktop/StaticLibrary_winlauncher.mk @@ -10,10 +10,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,winlauncher)) -$(eval $(call gb_StaticLibrary_add_defs,winlauncher,\ - -DUNICODE \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,winlauncher,\ desktop/win32/source/applauncher/launcher \ )) diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index c9ab99cc1c14..ba8b5601f699 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -23,11 +23,6 @@ $(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans)) $(eval $(call gb_Library_use_sdk_api,sysdtrans)) -$(eval $(call gb_Library_add_defs,sysdtrans,\ - -D_UNICODE \ - -DUNICODE \ -)) - $(eval $(call gb_Library_use_libraries,sysdtrans,\ comphelper \ cppu \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 27432868c004..208540db17a3 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -27,11 +27,6 @@ $(eval $(call gb_Library_use_external,fps,boost_headers)) $(eval $(call gb_Library_use_sdk_api,fps)) -$(eval $(call gb_Library_add_defs,fps,\ - -D_UNICODE \ - -DUNICODE \ -)) - $(eval $(call gb_Library_use_libraries,fps,\ comphelper \ cppu \ diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk index 2c8adc47c15d..5352f4ac2761 100644 --- a/onlineupdate/Executable_mar.mk +++ b/onlineupdate/Executable_mar.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_use_externals,mar,\ )) $(eval $(call gb_Executable_add_defs,mar,\ - -DUNICODE \ -DMAR_NSS \ )) diff --git a/onlineupdate/Executable_mbsdiff.mk b/onlineupdate/Executable_mbsdiff.mk index e5a49b5ac747..9c528a58b9ff 100644 --- a/onlineupdate/Executable_mbsdiff.mk +++ b/onlineupdate/Executable_mbsdiff.mk @@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_libs,mbsdiff,\ )) endif -$(eval $(call gb_Executable_add_defs,mbsdiff,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\ onlineupdate/source/mbsdiff/bsdiff \ )) diff --git a/onlineupdate/Executable_test_updater_dialog.mk b/onlineupdate/Executable_test_updater_dialog.mk index 92e70dfae337..877f380eb71c 100644 --- a/onlineupdate/Executable_test_updater_dialog.mk +++ b/onlineupdate/Executable_test_updater_dialog.mk @@ -39,10 +39,6 @@ $(eval $(call gb_Executable_add_ldflags,test_updater_dialog,\ /ENTRY:wmainCRTStartup \ )) -$(eval $(call gb_Executable_add_defs,test_updater_dialog,\ - -DUNICODE \ -)) - else $(eval $(call gb_Executable_add_defs,test_updater_dialog,\ diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 1ce5c9fb3efd..edd02f6ecf96 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -42,10 +42,6 @@ $(eval $(call gb_Executable_add_libs,update_service,\ advapi32.lib \ )) -$(eval $(call gb_Executable_add_defs,update_service,\ - -DUNICODE \ -)) - $(eval $(call gb_Executable_add_ldflags,update_service,\ /ENTRY:wmainCRTStartup \ )) diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index a4ceacee6bc1..9860e3cf38ef 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -50,7 +50,6 @@ $(eval $(call gb_Executable_add_ldflags,updater,\ $(eval $(call gb_Executable_add_defs,updater,\ -DVERIFY_MAR_SIGNATURE \ - -DUNICODE \ )) else diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index 1e0fc605566d..9b82e726a21d 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -14,10 +14,6 @@ $(eval $(call gb_StaticLibrary_set_include,libmar,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_defs,libmar,\ - -DUNICODE \ -)) - $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\ onlineupdate/source/libmar/src/mar_create \ onlineupdate/source/libmar/src/mar_extract \ diff --git a/onlineupdate/StaticLibrary_libmarverify.mk b/onlineupdate/StaticLibrary_libmarverify.mk index fe866204f4ee..41ac492a7b63 100644 --- a/onlineupdate/StaticLibrary_libmarverify.mk +++ b/onlineupdate/StaticLibrary_libmarverify.mk @@ -14,11 +14,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\ - -DUNICODE \ -)) -else +ifneq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\ -DMAR_NSS \ )) diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk index ab6b4edf77e1..1c3654cbc864 100644 --- a/onlineupdate/StaticLibrary_updatehelper.mk +++ b/onlineupdate/StaticLibrary_updatehelper.mk @@ -16,7 +16,6 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\ )) $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\ - -DUNICODE \ -DNSS3 \ -DVERIFY_MAR_SIGNATURE \ )) diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk index f20fa5ad5aea..816ebbb3f06a 100644 --- a/setup_native/Library_reg4allmsdoc.mk +++ b/setup_native/Library_reg4allmsdoc.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Library_Library,reg4allmsdoc)) $(eval $(call gb_Library_add_defs,reg4allmsdoc,\ - -DUNICODE \ - -D_UNICODE \ -U_DLL \ )) diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index e6780d014b5f..a4c2fccd2575 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -12,8 +12,6 @@ $(eval $(call gb_Library_Library,shlxtmsi)) $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers)) $(eval $(call gb_Library_add_defs,shlxtmsi,\ - -DUNICODE \ - -D_UNICODE \ -U_DLL \ )) diff --git a/setup_native/StaticLibrary_quickstarter.mk b/setup_native/StaticLibrary_quickstarter.mk index cc18d6a74a48..0517a7511016 100644 --- a/setup_native/StaticLibrary_quickstarter.mk +++ b/setup_native/StaticLibrary_quickstarter.mk @@ -10,8 +10,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,quickstarter)) $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\ - -DUNICODE \ - -D_UNICODE \ -U_DLL \ )) diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index dafee1032bb6..f8b4361a12cc 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,ooofilt,\ $(eval $(call gb_Library_add_defs,ooofilt,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index a9f4cd5b1be0..a09f89214f48 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,ooofilt_x64,\ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 148b2eab94fc..c0565b2d9f37 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,propertyhdl,\ $(eval $(call gb_Library_add_defs,propertyhdl,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 9599b3d30310..5736f2152a11 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,propertyhdl_x64,\ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index be4b67e949ee..4207c76037b1 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -16,9 +16,7 @@ $(eval $(call gb_Library_set_include,shlxthdl,\ $(eval $(call gb_Library_add_defs,shlxthdl,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index fb49fa0d0363..3501d46c3239 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Library_set_include,shlxthdl_x64,\ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ -UNOMINMAX \ )) diff --git a/shell/Library_spsupp.mk b/shell/Library_spsupp.mk index fd9bdba84351..1963bbfaebda 100644 --- a/shell/Library_spsupp.mk +++ b/shell/Library_spsupp.mk @@ -18,11 +18,6 @@ $(eval $(call gb_Library_set_include,spsupp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_defs,spsupp,\ - -DUNICODE \ - -D_UNICODE \ -)) - $(eval $(call gb_Library_use_system_win32_libs,spsupp,\ advapi32 \ kernel32 \ diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk index 4b29f27e31d2..cbb69df7d352 100644 --- a/shell/Library_spsupp_x64.mk +++ b/shell/Library_spsupp_x64.mk @@ -21,11 +21,6 @@ $(eval $(call gb_Library_set_include,spsupp_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_defs,spsupp_x64,\ - -DUNICODE \ - -D_UNICODE \ -)) - $(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\ advapi32 \ kernel32 \ diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk index 553418d37b2f..f19c942eabc8 100644 --- a/shell/StaticLibrary_shlxthandler_common.mk +++ b/shell/StaticLibrary_shlxthandler_common.mk @@ -16,9 +16,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ )) $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 94704381ca23..2f906c516e68 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -22,9 +22,7 @@ $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ -DISOLATION_AWARE_ENABLED \ - -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ - -D_UNICODE \ )) $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk index 24e125d42679..9fbb3b7b5bc6 100644 --- a/winaccessibility/Library_uacccom.mk +++ b/winaccessibility/Library_uacccom.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_set_include,UAccCOM,\ $(eval $(call gb_Library_add_defs,UAccCOM,\ -DUACCCOM_DLLIMPLEMENTATION \ - -D_UNICODE \ - -DUNICODE \ )) $(eval $(call gb_Library_use_sdk_api,UAccCOM))