Skip to content
Browse files

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

  • Loading branch information...
1 parent efe06e1 commit bcb971f930605c45d163da56679af06283981c5c @TheBlueMatt TheBlueMatt committed
Showing with 13 additions and 13 deletions.
  1. +12 −12 share/ui.rc
  2. +1 −1 src/makefile.mingw
View
24 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"
View
2 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

0 comments on commit bcb971f

Please sign in to comment.
Something went wrong with that request. Please try again.