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.linux-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.linux-mingw')
| -rw-r--r-- | src/makefile.linux-mingw | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 8b3df66d98..eb22190e57 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,20 +72,14 @@ 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 $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) @@ -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 |