Fix MinGW build due to bad pointers to ui.rc pixmaps stuff.

diff --git a/share/ui.rc b/share/ui.rc
index 0e0122d..063641c 100644 (file)
--- a/share/ui.rc
+++ b/share/ui.rc
@@ -1,15 +1,15 @@
-bitcoin               ICON    "rc/bitcoin.ico"\r
+bitcoin               ICON    "pixmaps/bitcoin.ico"\r
 \r
 #include "wx/msw/wx.rc"\r
 \r
-check                 ICON    "rc/check.ico"\r
-send16                BITMAP  "rc/send16.bmp"\r
-send16mask            BITMAP  "rc/send16mask.bmp"\r
-send16masknoshadow    BITMAP  "rc/send16masknoshadow.bmp"\r
-send20                BITMAP  "rc/send20.bmp"\r
-send20mask            BITMAP  "rc/send20mask.bmp"\r
-addressbook16         BITMAP  "rc/addressbook16.bmp"\r
-addressbook16mask     BITMAP  "rc/addressbook16mask.bmp"\r
-addressbook20         BITMAP  "rc/addressbook20.bmp"\r
-addressbook20mask     BITMAP  "rc/addressbook20mask.bmp"\r
-favicon               ICON    "rc/favicon.ico"\r
+check                 ICON    "pixmaps/check.ico"\r
+send16                BITMAP  "pixmaps/send16.bmp"\r
+send16mask            BITMAP  "pixmaps/send16mask.bmp"\r
+send16masknoshadow    BITMAP  "pixmaps/send16masknoshadow.bmp"\r
+send20                BITMAP  "pixmaps/send20.bmp"\r
+send20mask            BITMAP  "pixmaps/send20mask.bmp"\r
+addressbook16         BITMAP  "pixmaps/addressbook16.bmp"\r
+addressbook16mask     BITMAP  "pixmaps/addressbook16mask.bmp"\r
+addressbook20         BITMAP  "pixmaps/addressbook20.bmp"\r
+addressbook20mask     BITMAP  "pixmaps/addressbook20mask.bmp"\r
+favicon               ICON    "pixmaps/favicon.ico"\r

diff --git a/src/makefile.mingw b/src/makefile.mingw
index 1969ecc..57ece3b 100644 (file)
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -65,7 +65,7 @@ obj/%.o: %.cpp $(HEADERS)
 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