diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b /src/makefile.mingw | |
parent | ba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff) | |
parent | 4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff) | |
download | bitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/makefile.mingw')
-rw-r--r-- | src/makefile.mingw | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw index d1c6ba8bef..95d09f8770 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -69,20 +69,15 @@ 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 - g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< - 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) @@ -96,6 +91,5 @@ clean: -del /Q obj\* -del /Q obj\nogui\* -del /Q obj\test\* - -del /Q cryptopp\obj\* -del /Q test\*.o -del /Q headers.h.gch |