X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=novacoin-qt.pro;h=9d492ac233de0e8b8fd997048746748347741b00;hp=aca0e19926b2ace4c97cc968beef50ba2934b0dd;hb=bc33cfede4c7668b7476e1aa3894cac661c23a62;hpb=60b15cc146db37023defd09806662e679dbebb8e diff --git a/novacoin-qt.pro b/novacoin-qt.pro index aca0e19..9d492ac 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 +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS CONFIG += no_include_pwd CONFIG += thread CONFIG += static @@ -37,9 +37,6 @@ UI_DIR = build # use: qmake "RELEASE=1" contains(RELEASE, 1) { - # Mac: compile for maximum compatibility (10.5, 32-bit) - macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk - !windows:!macx { # Linux: static link LIBS += -Wl,-Bstatic @@ -136,12 +133,22 @@ contains(USE_LEVELDB, 1) { SOURCES += src/txdb-bdb.cpp } +# 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 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 } 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) + SOURCES += src/scrypt-intrin/scrypt-sse2.cpp + DEFINES += USE_SSE2 + QMAKE_CXXFLAGS += -msse2 + QMAKE_CFLAGS += -msse2 + } else { + message(Using generic scrypt implementation) + SOURCES += src/scrypt-generic.cpp + } } # regenerate src/build.h @@ -174,6 +181,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 \ @@ -185,6 +193,10 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/aboutdialog.h \ src/qt/editaddressdialog.h \ src/qt/bitcoinaddressvalidator.h \ + src/qt/mintingfilterproxy.h \ + src/qt/mintingtablemodel.h \ + src/qt/mintingview.h \ + src/kernelrecord.h \ src/alert.h \ src/addrman.h \ src/base58.h \ @@ -199,12 +211,11 @@ 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 \ + src/ministun.h \ src/key.h \ src/db.h \ src/txdb.h \ @@ -245,6 +256,7 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/bitcoinunits.h \ src/qt/qvaluecombobox.h \ src/qt/askpassphrasedialog.h \ + src/qt/trafficgraphwidget.h \ src/protocol.h \ src/qt/notificator.h \ src/qt/qtipcserver.h \ @@ -252,10 +264,16 @@ 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/clientversion.h \ + src/qt/multisigaddressentry.h \ + src/qt/multisiginputentry.h \ + src/qt/multisigdialog.h \ + src/qt/secondauthdialog.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 \ @@ -267,17 +285,24 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/aboutdialog.cpp \ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ + src/qt/trafficgraphwidget.cpp \ + src/qt/mintingfilterproxy.cpp \ + src/qt/mintingtablemodel.cpp \ + src/qt/mintingview.cpp \ + src/kernelrecord.cpp \ src/alert.cpp \ src/version.cpp \ src/sync.cpp \ src/util.cpp \ src/netbase.cpp \ + src/ntp.cpp \ src/key.cpp \ src/script.cpp \ src/main.cpp \ src/miner.cpp \ src/init.cpp \ src/net.cpp \ + src/stun.cpp \ src/irc.cpp \ src/checkpoints.cpp \ src/addrman.cpp \ @@ -318,13 +343,16 @@ 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/secondauthdialog.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 \ @@ -336,7 +364,11 @@ FORMS += \ src/qt/forms/sendcoinsentry.ui \ src/qt/forms/askpassphrasedialog.ui \ src/qt/forms/rpcconsole.ui \ - src/qt/forms/optionsdialog.ui + src/qt/forms/optionsdialog.ui \ + src/qt/forms/multisigaddressentry.ui \ + src/qt/forms/multisiginputentry.ui \ + src/qt/forms/multisigdialog.ui \ + src/qt/forms/secondauthdialog.ui contains(USE_QRCODE, 1) { HEADERS += src/qt/qrcodedialog.h @@ -348,7 +380,7 @@ CODECFORTR = UTF-8 # for lrelease/lupdate # also add new translations to src/qt/bitcoin.qrc under translations/ -TRANSLATIONS = $$files(src/qt/locale/novacoin_*.ts) +TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts) isEmpty(QMAKE_LRELEASE) { win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe @@ -416,8 +448,10 @@ windows:!contains(MINGW_THREAD_BUGFIX, 0) { LIBS += -lrt } -macx:HEADERS += src/qt/macdockiconhandler.h -macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm +macx:HEADERS += src/qt/macdockiconhandler.h \ + src/qt/macnotificationhandler.h +macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm \ + src/qt/macnotificationhandler.mm macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 macx:ICON = src/qt/res/icons/bitcoin.icns @@ -433,7 +467,7 @@ LIBS += -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 -windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX +windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX -Wl,-Bstatic -lpthread -Wl,-Bdynamic contains(RELEASE, 1) { !windows:!macx { @@ -442,4 +476,14 @@ contains(RELEASE, 1) { } } +linux-* { + # We may need some linuxism here + LIBS += -ldl +} + +netbsd-*|freebsd-*|openbsd-* { + # libexecinfo is required for back trace + LIBS += -lexecinfo +} + system($$QMAKE_LRELEASE -silent $$PWD/src/qt/locale/translations.pro)