Browse Source

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
tags/v0.15.1
s_nakamoto 11 years ago
parent
commit
e6b7ab5749
5 changed files with 14 additions and 6 deletions
  1. 10
    3
      build-unix.txt
  2. 1
    1
      makefile.mingw
  3. 1
    0
      makefile.osx
  4. 1
    1
      makefile.unix
  5. 1
    1
      serialize.h

+ 10
- 3
build-unix.txt View File

@@ -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

+ 1
- 1
makefile.mingw View File

@@ -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 $<

+ 1
- 0
makefile.osx View File

@@ -69,3 +69,4 @@ clean:
-rm -f bitcoin bitcoind
-rm -f obj/*.o
-rm -f obj/nogui/*.o
-rm -f cryptopp/obj/*.o

+ 1
- 1
makefile.unix View File

@@ -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)

+ 1
- 1
serialize.h View File

@@ -20,7 +20,7 @@ class CDataStream;
class CAutoFile;
static const int VERSION = 308;
static const char* pszSubVer = "";
static const char* pszSubVer = ".1";

Loading…
Cancel
Save