From bcb971f930605c45d163da56679af06283981c5c Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 14 May 2011 18:51:52 +0200 Subject: [PATCH] Fix MinGW build due to bad pointers to ui.rc pixmaps stuff. --- share/ui.rc | 24 ++++++++++++------------ src/makefile.mingw | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/share/ui.rc b/share/ui.rc index 0e0122de2b..063641cba2 100644 --- 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" diff --git a/src/makefile.mingw b/src/makefile.mingw index 1969ecc971..57ece3ba29 100644 --- 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