From d54f8955380a80d32f798452727c98bf2c525ed3 Mon Sep 17 00:00:00 2001 From: Magnus Melin Date: Sat, 25 Nov 2023 13:49:09 +0200 Subject: [PATCH] Bug 1866403 - Windows needs propsys. rs=bustage-fix --- mail/components/shell/moz.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mail/components/shell/moz.build b/mail/components/shell/moz.build index 6687759226..01abbfb9a4 100644 --- a/mail/components/shell/moz.build +++ b/mail/components/shell/moz.build @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"] - XPIDL_SOURCES += [ "nsIShellService.idl", ] @@ -18,6 +16,11 @@ if CONFIG["OS_ARCH"] == "WINNT": LOCAL_INCLUDES += [ "/other-licenses/nsis/Contrib/CityHash/cityhash", ] + OS_LIBS += [ + "bcrypt", + "crypt32", + "propsys", + ] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": SOURCES += [ @@ -31,6 +34,13 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if SOURCES: FINAL_LIBRARY = "mailcomps" +for var in ( + "MOZ_APP_DISPLAYNAME", + "MOZ_APP_NAME", + "MOZ_APP_VERSION", +): + DEFINES[var] = '"%s"' % CONFIG[var] + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]