changeset 26872:91c8f6368a8c

Work around a build problem in windres in recent binutils where string literal concatenation doesn't work. This is probably http://sourceware.org/bugzilla/show_bug.cgi?id=6714 but (at the moment) the comments on there imply it should work.
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 13 May 2009 18:09:45 +0000
parents f47f6f6ba439
children 727d960a75a4
files pidgin/win32/pidgin_dll_rc.rc.in pidgin/win32/pidgin_exe_rc.rc.in
diffstat 2 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/win32/pidgin_dll_rc.rc.in	Wed May 13 16:01:25 2009 +0000
+++ b/pidgin/win32/pidgin_dll_rc.rc.in	Wed May 13 18:09:45 2009 +0000
@@ -2,8 +2,6 @@
 #include "version.h"
 #include "resource.h"
 
-#define PIXMAPDIR "pixmaps/tray/16/"
-
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
   PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
@@ -33,11 +31,11 @@
     END
   END
 
-PIDGIN_TRAY_AVAILABLE_4BIT	ICON PIXMAPDIR "available_4bit.ico"
-PIDGIN_TRAY_AWAY_4BIT		ICON PIXMAPDIR "away_4bit.ico"
-PIDGIN_TRAY_BUSY_4BIT		ICON PIXMAPDIR "busy_4bit.ico"
-PIDGIN_TRAY_XA_4BIT		ICON PIXMAPDIR "extended-away_4bit.ico"
-PIDGIN_TRAY_OFFLINE_4BIT	ICON PIXMAPDIR "offline_4bit.ico"
-PIDGIN_TRAY_CONNECTING_4BIT	ICON PIXMAPDIR "connecting_4bit.ico"
-PIDGIN_TRAY_PENDING_4BIT	ICON PIXMAPDIR "message_4bit.ico"
-PIDGIN_TRAY_INVISIBLE_4BIT	ICON PIXMAPDIR "invisible_4bit.ico"
+PIDGIN_TRAY_AVAILABLE_4BIT	ICON "pixmaps/tray/16/available_4bit.ico"
+PIDGIN_TRAY_AWAY_4BIT		ICON "pixmaps/tray/16/away_4bit.ico"
+PIDGIN_TRAY_BUSY_4BIT		ICON "pixmaps/tray/16/busy_4bit.ico"
+PIDGIN_TRAY_XA_4BIT		ICON "pixmaps/tray/16/extended-away_4bit.ico"
+PIDGIN_TRAY_OFFLINE_4BIT	ICON "pixmaps/tray/16/offline_4bit.ico"
+PIDGIN_TRAY_CONNECTING_4BIT	ICON "pixmaps/tray/16/connecting_4bit.ico"
+PIDGIN_TRAY_PENDING_4BIT	ICON "pixmaps/tray/16/message_4bit.ico"
+PIDGIN_TRAY_INVISIBLE_4BIT	ICON "pixmaps/tray/16/invisible_4bit.ico"
--- a/pidgin/win32/pidgin_exe_rc.rc.in	Wed May 13 16:01:25 2009 +0000
+++ b/pidgin/win32/pidgin_exe_rc.rc.in	Wed May 13 18:09:45 2009 +0000
@@ -2,8 +2,6 @@
 #include "resource.h"
 #include "version.h"
 
-#define PIXMAPDIR "pixmaps/"
-
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
   PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
@@ -33,4 +31,4 @@
     END
   END
 
-PIDGIN_ICON			ICON PIXMAPDIR "pidgin.ico"
+PIDGIN_ICON			ICON "pixmaps/pidgin.ico"