From 8a38d5663ad6b98983c951b67c58aff2e94ff453 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto Date: Tue, 10 Aug 2010 16:01:23 +0000 Subject: [PATCH] enable SSE2 in all builds to fix crypto++ SHA-256 on 64-bit --- build-unix.txt | 13 ++++++++++--- makefile.mingw | 2 +- makefile.osx | 1 + makefile.unix | 2 +- serialize.h | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build-unix.txt b/build-unix.txt index 1ae29a42..cb8c3ae1 100644 --- a/build-unix.txt +++ b/build-unix.txt @@ -64,10 +64,17 @@ make install ldconfig +Berkeley DB +----------- +You need Berkeley DB 4.7. Don't use 4.8, the database/log0000* files +are incompatible. If you have to build Berkeley DB yourself: +../dist/configure --enable-cxx +make + + Boost ----- -If you want to build Boost yourself, -cd /usr/local/boost_1_40_0 -su +If you need to build Boost yourself: +sudo su ./bootstrap.sh ./bjam install diff --git a/makefile.mingw b/makefile.mingw index deb8df81..9140c23e 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -54,7 +54,7 @@ obj/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -DGUI -o $@ $< cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -DCRYPTOPP_DISABLE_SSE2 -o $@ $< + g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -o $@ $< obj/ui_res.o: ui.rc rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $< diff --git a/makefile.osx b/makefile.osx index 7fbcc9b0..7894d055 100644 --- a/makefile.osx +++ b/makefile.osx @@ -69,3 +69,4 @@ clean: -rm -f bitcoin bitcoind -rm -f obj/*.o -rm -f obj/nogui/*.o + -rm -f cryptopp/obj/*.o diff --git a/makefile.unix b/makefile.unix index 546a3ec2..6694dde0 100644 --- a/makefile.unix +++ b/makefile.unix @@ -51,7 +51,7 @@ obj/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -DGUI -o $@ $< cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $< + g++ -c $(CFLAGS) -O3 -o $@ $< bitcoin: $(OBJS) obj/ui.o obj/uibase.o g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS) diff --git a/serialize.h b/serialize.h index 2fb69c2c..521798e3 100644 --- a/serialize.h +++ b/serialize.h @@ -20,7 +20,7 @@ class CDataStream; class CAutoFile; static const int VERSION = 308; -static const char* pszSubVer = ""; +static const char* pszSubVer = ".1";