enable SSE2 in all builds to fix crypto++ SHA-256 on 64-bit
This commit is contained in:
parent
dd9e71843b
commit
8a38d5663a
@ -64,10 +64,17 @@ make install
|
|||||||
ldconfig
|
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
|
Boost
|
||||||
-----
|
-----
|
||||||
If you want to build Boost yourself,
|
If you need to build Boost yourself:
|
||||||
cd /usr/local/boost_1_40_0
|
sudo su
|
||||||
su
|
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
./bjam install
|
./bjam install
|
||||||
|
@ -54,7 +54,7 @@ obj/%.o: %.cpp $(HEADERS)
|
|||||||
g++ -c $(CFLAGS) -DGUI -o $@ $<
|
g++ -c $(CFLAGS) -DGUI -o $@ $<
|
||||||
|
|
||||||
cryptopp/obj/%.o: cryptopp/%.cpp
|
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
|
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 $<
|
windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $<
|
||||||
|
@ -69,3 +69,4 @@ clean:
|
|||||||
-rm -f bitcoin bitcoind
|
-rm -f bitcoin bitcoind
|
||||||
-rm -f obj/*.o
|
-rm -f obj/*.o
|
||||||
-rm -f obj/nogui/*.o
|
-rm -f obj/nogui/*.o
|
||||||
|
-rm -f cryptopp/obj/*.o
|
||||||
|
@ -51,7 +51,7 @@ obj/%.o: %.cpp $(HEADERS)
|
|||||||
g++ -c $(CFLAGS) -DGUI -o $@ $<
|
g++ -c $(CFLAGS) -DGUI -o $@ $<
|
||||||
|
|
||||||
cryptopp/obj/%.o: cryptopp/%.cpp
|
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
|
bitcoin: $(OBJS) obj/ui.o obj/uibase.o
|
||||||
g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
|
g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
|
||||||
|
@ -20,7 +20,7 @@ class CDataStream;
|
|||||||
class CAutoFile;
|
class CAutoFile;
|
||||||
|
|
||||||
static const int VERSION = 308;
|
static const int VERSION = 308;
|
||||||
static const char* pszSubVer = "";
|
static const char* pszSubVer = ".1";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user