X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=369a73451cbee9a4ffb7bd30018ba0fac7801817;hb=f1cc3f2b7b56686389a1deeaf0c7868a019d840e;hp=f540cafc59ed86c95944b028645531818c537cd3;hpb=a767cdb1f8901b4b3042a6745dc65912b7cc0ebd;p=novacoin.git diff --git a/novacoin-qt.pro b/novacoin-qt.pro index f540caf..369a734 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -4,11 +4,15 @@ VERSION = 0.7.5 INCLUDEPATH += src src/json src/qt QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS CONFIG += no_include_pwd CONFIG += thread CONFIG += static +linux-g++: QMAKE_TARGET.arch = $$QMAKE_HOST.arch +linux-g++-32: QMAKE_TARGET.arch = x86 +linux-g++-64: QMAKE_TARGET.arch = x86_64 + # for boost 1.37, add -mt to the boost libraries # use: qmake BOOST_LIB_SUFFIX=-mt # for boost thread win32 with _win32 sufix @@ -26,8 +30,6 @@ CONFIG += static #BDB_LIB_PATH=C:/deps/db-6.0.20/build_unix #OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include #OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j -#MINIUPNPC_INCLUDE_PATH=C:/deps/ -#MINIUPNPC_LIB_PATH=C:/deps/miniupnpc #QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4 #QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs @@ -35,6 +37,7 @@ OBJECTS_DIR = build MOC_DIR = build UI_DIR = build + # use: qmake "RELEASE=1" contains(RELEASE, 1) { !windows:!macx { @@ -55,31 +58,6 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++ -# use: qmake "USE_QRCODE=1" -# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support -contains(USE_QRCODE, 1) { - message(Building with QRCode support) - DEFINES += USE_QRCODE - LIBS += -lqrencode -} - -# use: qmake "USE_UPNP=1" ( enabled by default; default) -# or: qmake "USE_UPNP=0" (disabled by default) -# or: qmake "USE_UPNP=-" (not supported) -# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support -contains(USE_UPNP, -) { - message(Building without UPNP support) -} else { - message(Building with UPNP support) - count(USE_UPNP, 0) { - USE_UPNP=1 - } - DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB - INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH - LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc - win32:LIBS += -liphlpapi -} - # use: qmake "USE_DBUS=1" contains(USE_DBUS, 1) { message(Building with DBUS (Freedesktop notifications) support) @@ -133,21 +111,40 @@ contains(USE_LEVELDB, 1) { SOURCES += src/txdb-bdb.cpp } + # use: qmake "USE_ASM=1" contains(USE_ASM, 1) { - message(Using assembler scrypt implementation) - SOURCES += src/scrypt-asm/scrypt-arm.S src/scrypt-asm/scrypt-x86.S src/scrypt-asm/scrypt-x86_64.S src/scrypt-asm/asm-wrapper.cpp + message(Using assembler scrypt & sha256 implementations) + DEFINES += USE_ASM + + contains(QMAKE_TARGET.arch, x86) { + message("x86 platform, setting -msse2 & -mssse3 flags") + + QMAKE_CXXFLAGS += -msse2 -mssse3 + QMAKE_CFLAGS += -msse2 -mssse3 + } + + contains(QMAKE_TARGET.arch, x86_64) { + message("x86_64 platform, setting -mssse3 flag") + + QMAKE_CXXFLAGS += -mssse3 + QMAKE_CFLAGS += -mssse3 + } + + + 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) - SOURCES += src/scrypt-intrin/scrypt-sse2.cpp + 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 implementation) - SOURCES += src/scrypt-generic.cpp + message(Using generic scrypt & sha256 implementations) + SOURCES += src/crypto/scrypt/generic/scrypt-generic.cpp } } @@ -169,12 +166,6 @@ contains(USE_O3, 1) { QMAKE_CFLAGS += -O3 } -*-g++-32 { - message("32 platform, adding -msse2 flag") - - QMAKE_CXXFLAGS += -msse2 - QMAKE_CFLAGS += -msse2 -} QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector @@ -264,11 +255,14 @@ HEADERS += src/qt/bitcoingui.h \ src/ui_interface.h \ src/qt/rpcconsole.h \ src/version.h \ + src/ntp.h \ src/netbase.h \ src/clientversion.h \ src/qt/multisigaddressentry.h \ src/qt/multisiginputentry.h \ - src/qt/multisigdialog.h + src/qt/multisigdialog.h \ + src/qt/secondauthdialog.h \ + src/qt/qrcodedialog.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/intro.cpp \ @@ -293,6 +287,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/sync.cpp \ src/util.cpp \ src/netbase.cpp \ + src/ntp.cpp \ src/key.cpp \ src/script.cpp \ src/main.cpp \ @@ -342,7 +337,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/kernel.cpp \ src/qt/multisigaddressentry.cpp \ src/qt/multisiginputentry.cpp \ - src/qt/multisigdialog.cpp + src/qt/multisigdialog.cpp \ + src/qt/secondauthdialog.cpp \ + src/qt/qrcodedialog.cpp RESOURCES += \ src/qt/bitcoin.qrc @@ -363,13 +360,9 @@ FORMS += \ src/qt/forms/optionsdialog.ui \ src/qt/forms/multisigaddressentry.ui \ src/qt/forms/multisiginputentry.ui \ - src/qt/forms/multisigdialog.ui - -contains(USE_QRCODE, 1) { -HEADERS += src/qt/qrcodedialog.h -SOURCES += src/qt/qrcodedialog.cpp -FORMS += src/qt/forms/qrcodedialog.ui -} + src/qt/forms/multisigdialog.ui \ + src/qt/forms/secondauthdialog.ui \ + src/qt/forms/qrcodedialog.ui CODECFORTR = UTF-8 @@ -458,7 +451,7 @@ macx:QMAKE_CXXFLAGS_THREAD += -pthread # Set libraries and includes at end, to use platform-defined defaults if not overridden INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) -LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX +LIBS += -lqrencode -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX # -lgdi32 has to happen after -lcrypto (see #681) windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX