Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#242189

Browse Source 
r=pedemont
OS/2 only changes - cleanup resource compiling, get branding working on Firefox
This commit is contained in:
mkaply%us.ibm.com 2004-05-05 13:38:52 +00:00
parent b748016efc
commit f1bb9813b2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
browser/app/Makefile.in
View File

@ -136,10 +136,16 @@ endif
ifeq ($(OS_ARCH),OS2)
RESFILE=splashos2.res
RCFLAGS += -DMOZ_PHOENIX
ifdef BUILD_STATIC_LIBS
OS_LIBS += -lpmwinx
EXE_DEF_FILE = browser.def
RCFLAGS += -d MOZ_STATIC_BUILD -i $(DIST)/include/widget
RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include/widget
endif
ifdef DEBUG
RCFLAGS += -DDEBUG
endif
RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
include $(topsrcdir)/config/rules.mk
@ -262,6 +268,11 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
endif
ifeq ($(OS_ARCH),OS2)
cp $(srcdir)/firefox-os2.ico $(DIST)/branding/firefox.ico
cp $(srcdir)/firefox-os2.ico $(DIST)/branding/app.ico
cp $(srcdir)/document-os2.ico $(DIST)/branding/document.ico
endif
endif
libs::

6
browser/app/splashos2.rc
View File

@ -33,7 +33,7 @@
#define ID_DDE_APPLICATION_NAME 102
ICON 1 "mozos2.ico"
ICON 1 FIREFOX_ICO
DLGTEMPLATE IDD_SPLASH DISCARDABLE
BEGIN
@ -46,7 +46,11 @@ END
STRINGTABLE DISCARDABLE
BEGIN
#ifdef DEBUG
ID_DDE_APPLICATION_NAME, "Firefox Debug"
#else
ID_DDE_APPLICATION_NAME, "Firefox"
#endif
END
#ifdef MOZ_STATIC_BUILD