linux-g++: QMAKE_TARGET.arch = $$QMAKE_HOST.arch
linux-g++-32: QMAKE_TARGET.arch = i686
linux-g++-64: QMAKE_TARGET.arch = x86_64
+win32-g++-cross: QMAKE_TARGET.arch = $$TARGET_PLATFORM
# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
# use: qmake "USE_ASM=1"
contains(USE_ASM, 1) {
- message(Using assembler scrypt & sha256 implementations)
+ message(Using assembler scrypt implementations)
DEFINES += USE_ASM
- contains(QMAKE_TARGET.arch, i386) |
- contains(QMAKE_TARGET.arch, i386) |
- contains(QMAKE_TARGET.arch, i686) {
- message("x86 platform, setting -msse2 & -mssse3 flags")
+ contains(QMAKE_TARGET.arch, i386) | contains(QMAKE_TARGET.arch, i586) | contains(QMAKE_TARGET.arch, i686) {
+ message("x86 platform, setting -msse2 flag")
- QMAKE_CXXFLAGS += -msse2 -mssse3
- QMAKE_CFLAGS += -msse2 -mssse3
- }
-
- contains(QMAKE_TARGET.arch, x86_64) |
- contains(QMAKE_TARGET.arch, amd64) {
- message("x86_64 platform, setting -mssse3 flag")
-
- QMAKE_CXXFLAGS += -mssse3
- QMAKE_CFLAGS += -mssse3
+ QMAKE_CXXFLAGS += -msse2
+ QMAKE_CFLAGS += -msse2
}
-
SOURCES += src/crypto/scrypt/asm/scrypt-arm.S src/crypto/scrypt/asm/scrypt-x86.S src/crypto/scrypt/asm/scrypt-x86_64.S src/crypto/scrypt/asm/asm-wrapper.cpp
- SOURCES += src/crypto/sha2/asm/sha2-arm.S src/crypto/sha2/asm/sha2-x86.S src/crypto/sha2/asm/sha2-x86_64.S
} else {
# use: qmake "USE_SSE2=1"
contains(USE_SSE2, 1) {
message(Using SSE2 intrinsic scrypt implementation & generic sha256 implementation)
SOURCES += src/crypto/scrypt/intrin/scrypt-sse2.cpp
DEFINES += USE_SSE2
- QMAKE_CXXFLAGS += -msse2
+ QMAKE_CXXFLAGS += -msse2
QMAKE_CFLAGS += -msse2
} else {
- message(Using generic scrypt & sha256 implementations)
+ message(Using generic scrypt implementations)
SOURCES += src/crypto/scrypt/generic/scrypt-generic.cpp
}
}
}
-QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wno-unused-local-typedef -Wstack-protector
# Input
DEPENDPATH += src src/json src/qt
src/qt/multisiginputentry.h \
src/qt/multisigdialog.h \
src/qt/secondauthdialog.h \
- src/qt/qrcodedialog.h
+ src/qt/qrcodedialog.h \
+ src/ies.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/intro.cpp \
src/qt/transactionview.cpp \
src/qt/walletmodel.cpp \
src/bitcoinrpc.cpp \
+ src/rpccrypt.cpp \
src/rpcdump.cpp \
src/rpcnet.cpp \
src/rpcmining.cpp \
src/qt/multisiginputentry.cpp \
src/qt/multisigdialog.cpp \
src/qt/secondauthdialog.cpp \
- src/qt/qrcodedialog.cpp
+ src/qt/qrcodedialog.cpp \
+ src/base58.cpp \
+ src/cryptogram.cpp \
+ src/ecies.cpp
RESOURCES += \
src/qt/bitcoin.qrc
# platform specific defaults, if not overridden on command line
isEmpty(BOOST_LIB_SUFFIX) {
windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_53
+ macx:BOOST_LIB_SUFFIX = -mt
}
isEmpty(BOOST_THREAD_LIB_SUFFIX) {
}
isEmpty(OPENSSL_LIB_PATH) {
- macx:OPENSSL_LIB_PATH = /usr/local/ssl/lib
+ macx:OPENSSL_LIB_PATH = /opt/local/lib
}
isEmpty(BDB_LIB_SUFFIX) {
- macx:BDB_LIB_SUFFIX = -6.1
+ macx:BDB_LIB_SUFFIX = -6.0
}
isEmpty(BDB_INCLUDE_PATH) {
- macx:BDB_INCLUDE_PATH = /usr/local/BerkeleyDB.6.1/include
+ macx:BDB_INCLUDE_PATH = /opt/local/include/db60
}
isEmpty(OPENSSL_INCLUDE_PATH) {
- macx:OPENSSL_INCLUDE_PATH = /usr/local/ssl/include
+ macx:OPENSSL_INCLUDE_PATH = /opt/local/include
}
isEmpty(BOOST_LIB_PATH) {
- macx:BOOST_LIB_PATH = /usr/local/lib
+ macx:BOOST_LIB_PATH = /opt/local/lib
}
isEmpty(BOOST_INCLUDE_PATH) {
- macx:BOOST_INCLUDE_PATH = /usr/local/include
+ macx:BOOST_INCLUDE_PATH = /opt/local/include
}
windows:DEFINES += WIN32