X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=25f6bc5e8a976502b8b2cccc3b1523a637c2c136;hb=1c7ed42093c5935e3958584ed98a2b03466a0023;hp=79905ba70ac9953bbf46ce2344e19c831b0bcab7;hpb=7b4cc85e8ad9011daf1da769cb1426e803a1518d;p=novacoin.git diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 79905ba..25f6bc5 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -4,7 +4,7 @@ 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 @@ -26,8 +26,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 @@ -55,31 +53,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) @@ -135,21 +108,33 @@ contains(USE_LEVELDB, 1) { # use: qmake "USE_ASM=1" contains(USE_ASM, 1) { - message(Using optimized scrypt core implementation) - SOURCES += src/scrypt-arm.S src/scrypt-x86.S src/scrypt-x86_64.S + message(Using assembler scrypt & sha256 implementations) + DEFINES += USE_ASM + QMAKE_CFLAGS += -msse2 + QMAKE_CXXFLAGS += -msse2 + + contains(USE_SSSE3, 1) { + DEFINES += USE_SSSE3 + QMAKE_CFLAGS += -mssse3 + QMAKE_CXXFLAGS += -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 { - message(Using generic scrypt core implementation) - SOURCES += src/scrypt-generic.c + # 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_CFLAGS += -msse2 + } else { + message(Using generic scrypt & sha256 implementations) + SOURCES += src/crypto/scrypt/generic/scrypt-generic.cpp + } } -# use: qmake "USE_SSE2=1" -contains(USE_SSE2, 1) { - message(Using SSE2 scrypt core implementation) - SOURCES += src/scrypt-sse2.cpp - DEFINES += USE_SSE2 - QMAKE_CXXFLAGS += -msse2 - QMAKE_CFLAGS += -msse2 -} # regenerate src/build.h !windows|contains(USE_BUILD_INFO, 1) { genbuild.depends = FORCE @@ -180,6 +165,7 @@ QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qu # Input DEPENDPATH += src src/json src/qt HEADERS += src/qt/bitcoingui.h \ + src/qt/intro.h \ src/qt/transactiontablemodel.h \ src/qt/addresstablemodel.h \ src/qt/optionsdialog.h \ @@ -209,9 +195,7 @@ HEADERS += src/qt/bitcoingui.h \ src/uint256.h \ src/kernel.h \ src/scrypt.h \ - src/pbkdf2.h \ src/serialize.h \ - src/strlcpy.h \ src/main.h \ src/miner.h \ src/net.h \ @@ -264,13 +248,17 @@ 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 \ src/qt/transactiontablemodel.cpp \ src/qt/addresstablemodel.cpp \ src/qt/optionsdialog.cpp \ @@ -292,6 +280,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 \ @@ -339,16 +328,17 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/rpcconsole.cpp \ src/noui.cpp \ src/kernel.cpp \ - src/scrypt.cpp \ - src/pbkdf2.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 FORMS += \ + src/qt/forms/intro.ui \ src/qt/forms/coincontroldialog.ui \ src/qt/forms/sendcoinsdialog.ui \ src/qt/forms/addressbookpage.ui \ @@ -363,13 +353,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 +444,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