From de5edda6ab74b5137e0af043e940dde483b9ed39 Mon Sep 17 00:00:00 2001 From: Justin Dolske Date: Tue, 7 Jul 2009 21:14:43 -0700 Subject: [PATCH] Bug 499810 - Firefox missing app icon on Windows CE. r=vladimir --- browser/app/Makefile.in | 4 +++- browser/branding/unofficial/Makefile.in | 4 +++- other-licenses/branding/firefox/Makefile.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 23519a0c55d..34e7a37079a 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -192,7 +192,9 @@ endif ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32) +endif +ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) RCINCLUDE = splash.rc ifndef GNU_CC RCFLAGS += -DMOZ_PHOENIX -I$(srcdir) @@ -323,7 +325,7 @@ endif export:: ifndef MOZ_BRANDING_DIRECTORY $(NSINSTALL) -D $(DIST)/branding -ifeq ($(OS_ARCH),WINNT) +ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) cp $(srcdir)/firefox.ico $(DIST)/branding/firefox.ico cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico cp $(srcdir)/document.ico $(DIST)/branding/document.ico diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in index 9636e1a94b0..57fc3e34ca1 100644 --- a/browser/branding/unofficial/Makefile.in +++ b/browser/branding/unofficial/Makefile.in @@ -44,8 +44,10 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/background.png $(DIST)/branding/background.png cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns endif -ifeq ($(OS_ARCH),WINNT) +ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico +endif +ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in index 9636e1a94b0..57fc3e34ca1 100644 --- a/other-licenses/branding/firefox/Makefile.in +++ b/other-licenses/branding/firefox/Makefile.in @@ -44,8 +44,10 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/background.png $(DIST)/branding/background.png cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns endif -ifeq ($(OS_ARCH),WINNT) +ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) cp $(srcdir)/firefox.ico $(DIST)/branding/app.ico +endif +ifeq ($(OS_ARCH),WINNT) cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp