mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-16 13:56:29 +00:00
bug 351155 - Fixes places where Win32 official branding wasn't working. r1=ssitter, r2=dmose
This commit is contained in:
parent
731c29e07d
commit
18c928afaf
@ -116,7 +116,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
|
||||
|
||||
export::
|
||||
ifndef MOZ_USE_OFFICIAL_BRANDING
|
||||
ifndef MOZ_BRANDING_DIRECTORY
|
||||
$(NSINSTALL) -D $(DIST)/branding
|
||||
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
|
||||
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
|
||||
|
@ -41,8 +41,9 @@
|
||||
|
||||
1 24 "MozillaSunbird.exe.manifest"
|
||||
|
||||
IDI_APPICON ICON "sunbird.ico"
|
||||
IDI_APPLICATION ICON "sunbird.ico"
|
||||
# SUNBIRD_ICO is defined in ./Makefile for generic vs. official branding
|
||||
IDI_APPICON ICON SUNBIRD_ICO
|
||||
IDI_APPLICATION ICON SUNBIRD_ICO
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
|
@ -49,7 +49,7 @@ ifeq ($(OS_ARCH),WINNT)
|
||||
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
|
||||
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
|
||||
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
|
||||
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/Watermark.bmp
|
||||
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
|
||||
endif
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
|
||||
|
Loading…
x
Reference in New Issue
Block a user