forked from mirrors/gecko-dev
		
	Bug 499810 - Firefox missing app icon on Windows CE. r=vladimir
This commit is contained in:
		
							parent
							
								
									d2ca4abd8e
								
							
						
					
					
						commit
						bdf6747010
					
				
					 3 changed files with 9 additions and 3 deletions
				
			
		|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Justin Dolske
						Justin Dolske