From 6ccff2cbdebca38e4913b679784a4865edfbb12a Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 27 Sep 2011 20:16:07 +0200 Subject: remove cryptopp dependency, add simple unittest for SHA256Transform() --- src/makefile.linux-mingw | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/makefile.linux-mingw') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 8b3df66d98..b8ca9e6a1e 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -51,6 +51,7 @@ HEADERS = \ util.h \ wallet.h + ifdef USE_UPNP LIBPATHS += -L"$(DEPSDIR)/miniupnpc" LIBS += -l miniupnpc -l iphlpapi @@ -71,16 +72,10 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o - + obj/wallet.o all: bitcoind.exe -cryptopp/obj/%.o: cryptopp/%.cpp - i586-mingw32msvc-g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< - obj/nogui/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< @@ -99,7 +94,6 @@ clean: -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o - -rm -f cryptopp/obj/*.o -rm -f test/*.o -rm -f headers.h.gch -rm -f bitcoind.exe -- cgit v1.2.3 From c1131a28adf041c62248b4b075a45fd65ee8d132 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 7 Oct 2011 14:35:36 -0400 Subject: Remove ui_res from makefiles --- src/makefile.linux-mingw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/makefile.linux-mingw') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index b8ca9e6a1e..eb22190e57 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) -- cgit v1.2.3