1 diff --git a/browser/app/application.ini b/browser/app/application.ini |
1 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
2 --- a/browser/app/application.ini |
2 --- a/browser/app/Makefile.in |
3 +++ b/browser/app/application.ini |
3 +++ b/browser/app/Makefile.in |
4 @@ -53,13 +53,13 @@ ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384 |
4 @@ -223,22 +223,16 @@ endif |
5 [Gecko] |
5 ifdef DEBUG |
6 MinVersion=@GRE_MILESTONE@ |
6 RCFLAGS += -DDEBUG |
7 MaxVersion=@GRE_MILESTONE@ |
7 endif |
|
8 RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\" |
|
9 endif |
8 |
10 |
9 [XRE] |
11 include $(topsrcdir)/config/rules.mk |
10 EnableProfileMigrator=1 |
|
11 EnableExtensionManager=1 |
|
12 |
12 |
13 +#ifdef MOZ_CRASHREPORTER |
13 -DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" |
14 [Crash Reporter] |
14 - |
15 -#if MOZILLA_OFFICIAL |
15 -ifdef MOZILLA_OFFICIAL |
16 Enabled=1 |
16 -DEFINES += -DMOZILLA_OFFICIAL |
17 +ServerURL=https://crash-reports.mozilla.com/submit |
17 -endif |
18 #endif |
18 - |
19 -ServerURL=https://crash-reports.mozilla.com/submit |
19 ifdef BUILD_STATIC_LIBS |
|
20 include $(topsrcdir)/config/static-rules.mk |
|
21 |
|
22 DEFINES += -DIMPL_XREAPI |
|
23 endif |
|
24 |
|
25 ifeq ($(MOZ_WIDGET_TOOLKIT),photon) |
|
26 LIBS += -lphexlib |
|
27 @@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME) |
|
28 |
|
29 GARBAGE += $(MOZ_APP_NAME) |
|
30 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) |
|
31 |
|
32 endif |
|
33 |
|
34 endif # LIBXUL_SDK |
|
35 |
|
36 +ifdef MOZILLA_OFFICIAL |
|
37 +DEFINES += -DMOZILLA_OFFICIAL |
|
38 +endif |
|
39 + |
|
40 +DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" |
|
41 + |
|
42 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
43 libs:: |
|
44 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
|
45 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
|
46 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default |
|
47 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default |
|
48 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default |
|
49 endif |