enable SSE2 in all builds to fix crypto++ SHA-256 on 64-bit

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@124 1a98c847-1fd6-4fd8-948a-caf3550aa51b

diff --git a/build-unix.txt b/build-unix.txt
index f1f001b..51c14e3 100644 (file)
--- a/build-unix.txt
+++ b/build-unix.txt
@@ -64,10 +64,17 @@ make install
 ldconfig\r
 \r
 \r
+Berkeley DB\r
+-----------\r
+You need Berkeley DB 4.7.  Don't use 4.8, the database/log0000* files\r
+are incompatible.  If you have to build Berkeley DB yourself:\r
+../dist/configure --enable-cxx\r
+make\r
+\r
+\r
 Boost\r
 -----\r
-If you want to build Boost yourself,\r
-cd /usr/local/boost_1_40_0\r
-su\r
+If you need to build Boost yourself:\r
+sudo su\r
 ./bootstrap.sh\r
 ./bjam install\r

diff --git a/makefile.mingw b/makefile.mingw
index 9596ece..eee465c 100644 (file)
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -54,7 +54,7 @@ obj/%.o: %.cpp $(HEADERS)
        g++ -c $(CFLAGS) -DGUI -o $@ $<\r
 \r
 cryptopp/obj/%.o: cryptopp/%.cpp\r
-       g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -DCRYPTOPP_DISABLE_SSE2 -o $@ $<\r
+       g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -o $@ $<\r
 \r
 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\r
        windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $<\r

diff --git a/makefile.osx b/makefile.osx
index 167715b..5322f29 100644 (file)
--- a/makefile.osx
+++ b/makefile.osx
@@ -69,3 +69,4 @@ clean:
        -rm -f bitcoin bitcoind\r
        -rm -f obj/*.o\r
        -rm -f obj/nogui/*.o\r
+       -rm -f cryptopp/obj/*.o\r

diff --git a/makefile.unix b/makefile.unix
index e965287..7418d6d 100644 (file)
--- a/makefile.unix
+++ b/makefile.unix
@@ -51,7 +51,7 @@ obj/%.o: %.cpp $(HEADERS)
        g++ -c $(CFLAGS) -DGUI -o $@ $<\r
 \r
 cryptopp/obj/%.o: cryptopp/%.cpp\r
-       g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $<\r
+       g++ -c $(CFLAGS) -O3 -o $@ $<\r
 \r
 bitcoin: $(OBJS) obj/ui.o obj/uibase.o\r
        g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)\r

diff --git a/serialize.h b/serialize.h
index 77c1bc0..50e15c1 100644 (file)
--- a/serialize.h
+++ b/serialize.h
@@ -20,7 +20,7 @@ class CDataStream;
 class CAutoFile;\r
 \r
 static const int VERSION = 308;\r
-static const char* pszSubVer = "";\r
+static const char* pszSubVer = ".1";\r
 \r
 \r
 \r