Mercurial > hg > bitcoin

changeset 592:0e700b672eb6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MinGW build due to bad pointers to ui.rc pixmaps stuff.
author Matt Corallo <matt@bluematt.me>
date Sat, 14 May 2011 18:51:52 +0200 (2011-05-14)
parents d0dcb95f5d36
children 5a09de831d51
files share/ui.rc src/makefile.mingw
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/share/ui.rc
+++ b/share/ui.rc
@@ -1,15 +1,15 @@
-bitcoin               ICON    "rc/bitcoin.ico"
+bitcoin               ICON    "pixmaps/bitcoin.ico"
 
 #include "wx/msw/wx.rc"
 
-check                 ICON    "rc/check.ico"
-send16                BITMAP  "rc/send16.bmp"
-send16mask            BITMAP  "rc/send16mask.bmp"
-send16masknoshadow    BITMAP  "rc/send16masknoshadow.bmp"
-send20                BITMAP  "rc/send20.bmp"
-send20mask            BITMAP  "rc/send20mask.bmp"
-addressbook16         BITMAP  "rc/addressbook16.bmp"
-addressbook16mask     BITMAP  "rc/addressbook16mask.bmp"
-addressbook20         BITMAP  "rc/addressbook20.bmp"
-addressbook20mask     BITMAP  "rc/addressbook20mask.bmp"
-favicon               ICON    "rc/favicon.ico"
+check                 ICON    "pixmaps/check.ico"
+send16                BITMAP  "pixmaps/send16.bmp"
+send16mask            BITMAP  "pixmaps/send16mask.bmp"
+send16masknoshadow    BITMAP  "pixmaps/send16masknoshadow.bmp"
+send20                BITMAP  "pixmaps/send20.bmp"
+send20mask            BITMAP  "pixmaps/send20mask.bmp"
+addressbook16         BITMAP  "pixmaps/addressbook16.bmp"
+addressbook16mask     BITMAP  "pixmaps/addressbook16mask.bmp"
+addressbook20         BITMAP  "pixmaps/addressbook20.bmp"
+addressbook20mask     BITMAP  "pixmaps/addressbook20mask.bmp"
+favicon               ICON    "pixmaps/favicon.ico"
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -65,7 +65,7 @@
 cryptopp/obj/%.o: cryptopp/%.cpp
 	g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -o $@ $<
 
-obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp
+obj/ui_res.o: ../share/ui.rc  ../share/pixmaps/bitcoin.ico ../share/pixmaps/check.ico ../share/pixmaps/send16.bmp ../share/pixmaps/send16mask.bmp ../share/pixmaps/send16masknoshadow.bmp ../share/pixmaps/send20.bmp ../share/pixmaps/send20mask.bmp ../share/pixmaps/addressbook16.bmp ../share/pixmaps/addressbook16mask.bmp ../share/pixmaps/addressbook20.bmp ../share/pixmaps/addressbook20mask.bmp
 	windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $<
 
 bitcoin.exe: $(OBJS) obj/ui.o obj/uibase.o obj/ui_res.o