pidgin: 5c1c30af: Work around a build problem in windres i...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 5c1c30af9b5bb9375624843973da15c5fa07885b
Ancestor: ecd9624a7b67f4d8e8520d0a6343675b59b2c1ab
Author: nosnilmot at pidgin.im
Date: 2009-05-13T18:09:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5c1c30af9b5bb9375624843973da15c5fa07885b

Modified files:
        pidgin/win32/pidgin_dll_rc.rc.in
        pidgin/win32/pidgin_exe_rc.rc.in

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- pidgin/win32/pidgin_dll_rc.rc.in	eecb8f0c683a49fed2095359d507ccf9dc995f06
+++ pidgin/win32/pidgin_dll_rc.rc.in	323b38d0c4268ad960299f4104ba1e38db2e103d
@@ -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 @@ VS_VERSION_INFO VERSIONINFO
     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"
============================================================
--- pidgin/win32/pidgin_exe_rc.rc.in	bbaf60b502d35a4a8a5c69b44c8321104253ac92
+++ pidgin/win32/pidgin_exe_rc.rc.in	4b3eed8451e2551568ae8c7b035a4bb907ee927e
@@ -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 @@ VS_VERSION_INFO VERSIONINFO
     END
   END
 
-PIDGIN_ICON			ICON PIXMAPDIR "pidgin.ico"
+PIDGIN_ICON			ICON "pixmaps/pidgin.ico"