From c1131a28adf041c62248b4b075a45fd65ee8d132 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 7 Oct 2011 14:35:36 -0400 Subject: [PATCH] Remove ui_res from makefiles --- src/makefile.linux-mingw | 2 +- src/makefile.mingw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index b8ca9e6..eb22190 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -79,7 +79,7 @@ all: bitcoind.exe obj/nogui/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) diff --git a/src/makefile.mingw b/src/makefile.mingw index 73d3940..95d09f8 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -77,7 +77,7 @@ all: bitcoind.exe obj/nogui/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) -- 1.7.1