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.vc | |
| 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.vc')
| -rw-r--r-- | src/makefile.vc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index accc762b56..c7e8578a95 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -76,13 +76,7 @@ OBJS= \ obj\protocol.o \ obj\script.o \ obj\util.o \ - obj\wallet.o \ - cryptopp\obj\sha.o \ - cryptopp\obj\cpu.o - -CRYPTOPP_OBJS= \ - cryptopp\obj\sha.obj \ - cryptopp\obj\cpu.obj + obj\wallet.o RC=../share @@ -119,12 +113,6 @@ obj\ui.obj: $(HEADERS) obj\uibase.obj: $(HEADERS) -cryptopp\obj\sha.obj: cryptopp\sha.cpp - cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s - -cryptopp\obj\cpu.obj: cryptopp\cpu.cpp - cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s - .cpp{obj\nogui}.obj: cl $(CFLAGS) /Fo$@ %s @@ -148,13 +136,12 @@ obj\nogui\rpc.obj: $(HEADERS) obj\nogui\init.obj: $(HEADERS) -bitcoind.exe: $(OBJS:obj\=obj\nogui\) $(CRYPTOPP_OBJS) obj\ui.res +bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\ui.res link /nologo /OUT:$@ $(LIBPATHS) $** $(LIBS) clean: -del /Q obj\* -del /Q obj\nogui\* - -del /Q cryptopp\obj\* -del /Q *.ilk -del /Q *.pdb -del /Q bitcoind.exe |