bug 389448 - Icons not included in static SeaMonkey build, r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Thu, 28 May 2009 17:05:24 +0200
changeset 2719 8d2d487a09bac1578a7e0bfbd26dae8a28d0738c
parent 2718 2457fbd6cc1f35e2624e8517b076c828cfbe6085
child 2720 583c02e1441a375f9c25e4ab3fe7c32bdffc3cc5
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs389448
bug 389448 - Icons not included in static SeaMonkey build, r=Standard8
suite/app/Makefile.in
suite/app/splash.rc
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -43,16 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 AB_CD = $(MOZ_UI_LOCALE) 
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
 DEFINES += \
+	-DSEAMONKEY_ICO=\"../branding/icons/windows/seamonkey.ico\" \
 	-DAB_CD=$(AB_CD) \
 	-DAPP_VERSION="$(MOZ_APP_VERSION)" \
 	-DGRE_MILESTONE=$(GRE_MILESTONE) \
 	-DGRE_BUILDID=$(GRE_BUILDID) \
 	$(NULL)
 
 SOURCE_STAMP := $(shell cd $(topsrcdir) ; hg identify -i 2>/dev/null | cut -f1 -d' ')
 ifdef SOURCE_STAMP
--- a/suite/app/splash.rc
+++ b/suite/app/splash.rc
@@ -36,15 +36,55 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
 1 24 "seamonkey.exe.manifest"
 
 // Program icon.
-IDI_APPLICATION ICON
-	"..\branding\icons\windows\seamonkey.ico"
+IDI_APPLICATION ICON SEAMONKEY_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
 	IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 END
+
+#ifdef MOZ_STATIC_BUILD
+
+// XXX This code is copied from resource.h and widget.rc.  It's a work-around
+// for the limitation that only one resource file can be used in an .exe.  We
+// should develop a method, for static builds only, to combine multiple .rc
+// files into a single .rc file, and then use that to build the single .res
+// file for the .exe.
+
+#define IDC_GRAB                        4101
+#define IDC_GRABBING                    4102
+#define IDC_CELL                        4103
+#define IDC_COPY                        4104
+#define IDC_ALIAS                       4105
+#define IDC_ZOOMIN                      4106
+#define IDC_ZOOMOUT                     4107
+#define IDC_COLRESIZE                   4108
+#define IDC_ROWRESIZE                   4109
+#define IDC_VERTICALTEXT                4110
+#define IDC_NONE                        4112
+
+IDC_GRAB                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grab.cur"
+IDC_GRABBING            CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grabbing.cur"
+IDC_CELL                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/cell.cur"
+IDC_COPY                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/copy.cur"
+IDC_ALIAS               CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/aliasb.cur"
+IDC_ZOOMIN              CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_in.cur"
+IDC_ZOOMOUT             CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_out.cur"
+IDC_COLRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/col_resize.cur"
+IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/row_resize.cur"
+IDC_VERTICALTEXT        CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/vertical_text.cur"
+IDC_NONE                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/none.cur"
+
+// For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
+#define IDI_MAILBIFF 101
+IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
+
+#define IDI_APPICON 100
+IDI_APPICON  ICON  SEAMONKEY_ICO
+
+#endif