diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-05 10:38:10 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-10-05 10:38:10 -0400 |
| commit | b898c8fce687de9320bfae8dd2392e92c5464831 (patch) | |
| tree | 0eae81bd8a40703143a5bbe74ce6648ca0b143c7 /src/makefile.osx | |
| parent | 8bc52d069247b3c7968bbb5c9ced9e6a7baa57e8 (diff) | |
| parent | 452506fc4153be072fe443fe3e3cbf76d9563a42 (diff) | |
| download | bitcoin-b898c8fce687de9320bfae8dd2392e92c5464831.tar.xz | |
Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin
Diffstat (limited to 'src/makefile.osx')
| -rw-r--r-- | src/makefile.osx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/makefile.osx b/src/makefile.osx index 1d1d6b7b7b..f9de4d7091 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -64,9 +64,7 @@ OBJS= \ obj/bitcoinrpc.o \ obj/script.o \ obj/util.o \ - obj/wallet.o \ - cryptopp/obj/sha.o \ - cryptopp/obj/cpu.o + obj/wallet.o ifdef USE_UPNP LIBS += $(DEPSDIR)/lib/libminiupnpc.a @@ -76,9 +74,6 @@ endif all: bitcoind -cryptopp/obj/%.o: cryptopp/%.cpp - $(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $< - obj/nogui/%.o: %.cpp $(HEADERS) $(CXX) -c $(CFLAGS) -o $@ $< @@ -96,4 +91,3 @@ clean: -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o - -rm -f cryptopp/obj/*.o |