On Windows CE, put an icon inside instantbird.exe.
authorFlorian Quèze <florian@instantbird.org>
Sat, 25 Jul 2009 13:00:46 +0200
changeset 17713 2a4bfe979c8361c5a467d0c92c3b5d0fda5187e7
parent 17712 5189e79b4d5aa6f97ef0c877ab4c1264f05b25cb
child 17714 0cf4db4cfdfa5f72278156b67ec8a6354de1342b
push idunknown
push userunknown
push dateunknown
On Windows CE, put an icon inside instantbird.exe.
im/app/Makefile.in
im/app/splash.rc
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -204,16 +204,19 @@ CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 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_INSTANTBIRD -I$(srcdir)
 else
 RCFLAGS += -DMOZ_INSTANTBIRD --include-dir $(srcdir)
 endif
 ifdef BUILD_STATIC_LIBS
 RCFLAGS += -DMOZ_STATIC_BUILD
--- a/im/app/splash.rc
+++ b/im/app/splash.rc
@@ -35,17 +35,24 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
 1 24 "instantbird.exe.manifest" 
 
+#define IDI_APPICON 1
+#define IDI_DOCUMENT 2
+#ifndef IDI_APPLICATION
+#define IDI_APPLICATION 32512
+#endif
+
 // Program icon.
+IDI_APPICON  ICON  INSTANTBIRD_ICO
 IDI_APPLICATION ICON INSTANTBIRD_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
 #ifdef DEBUG
     IDS_STARTMENU_APPNAME,              "Instantbird Debug"
 #else
     IDS_STARTMENU_APPNAME,              "Instantbird"
@@ -78,14 +85,9 @@ IDC_CELL                CURSOR  DISCARDA
 IDC_COPY                CURSOR  DISCARDABLE     "../../widget/src/build/res/copy.cur"
 IDC_ALIAS               CURSOR  DISCARDABLE     "../../widget/src/build/res/aliasb.cur"
 IDC_ZOOMIN              CURSOR  DISCARDABLE     "../../widget/src/build/res/zoom_in.cur"
 IDC_ZOOMOUT             CURSOR  DISCARDABLE     "../../widget/src/build/res/zoom_out.cur"
 IDC_COLRESIZE           CURSOR  DISCARDABLE     "../../widget/src/build/res/col_resize.cur"
 IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../widget/src/build/res/row_resize.cur"
 IDC_VERTICALTEXT        CURSOR  DISCARDABLE     "../../widget/src/build/res/vertical_text.cur"
 IDC_NONE                CURSOR  DISCARDABLE     "../../widget/src/build/res/none.cur"
-
-#define IDI_APPICON 100
-IDI_APPICON  ICON  INSTANTBIRD_ICO
-
 #endif
-