diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-08-09 19:54:40 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-08-09 19:54:40 +0000 |
| commit | e6b7ab57496c9267c5d0bbad2be8e942a01731dc (patch) | |
| tree | 6b913f7abdc6a062e36e7bf5fa15a9e121ab0848 | |
| parent | 0c50722270a97e9fe3fd19283c85ee5f82603d0d (diff) | |
| download | bitcoin-e6b7ab57496c9267c5d0bbad2be8e942a01731dc.tar.xz | |
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
| -rw-r--r-- | build-unix.txt | 13 | ||||
| -rw-r--r-- | makefile.mingw | 2 | ||||
| -rw-r--r-- | makefile.osx | 1 | ||||
| -rw-r--r-- | makefile.unix | 2 | ||||
| -rw-r--r-- | serialize.h | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/build-unix.txt b/build-unix.txt index f1f001ba70..51c14e37cf 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 9596ece97b..eee465ca28 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 167715b5c1..5322f29d13 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 e965287917..7418d6dcf4 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 77c1bc04b4..50e15c1013 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";
|