X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=670271b6d867f0d733a408270a68231f1805bc6e;hb=b701d4b7f52f32d1a8e854ce3ab8123fde964064;hp=739a69d87497e977e80aeaae0e94efcbad8dcc2e;hpb=f33f1bcdfb992637d0805b5c3cf3dda7a1bd9e7a;p=novacoin.git diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 739a69d..670271b 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 @@ -55,7 +52,8 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 } # for extra security on Windows: enable ASLR and DEP via GCC linker flags -win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static +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 @@ -76,7 +74,7 @@ contains(USE_UPNP, -) { count(USE_UPNP, 0) { USE_UPNP=1 } - DEFINES += USE_UPNP=$$USE_UPNP STATICLIB + DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc win32:LIBS += -liphlpapi @@ -122,7 +120,7 @@ contains(USE_LEVELDB, 1) { QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) } LIBS += -lshlwapi - #genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a } genleveldb.target = $$PWD/src/leveldb/libleveldb.a genleveldb.depends = FORCE @@ -184,6 +182,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,22 +201,12 @@ HEADERS += src/qt/bitcoingui.h \ src/kernel.h \ src/scrypt.h \ src/pbkdf2.h \ - src/zerocoin/Accumulator.h \ - src/zerocoin/AccumulatorProofOfKnowledge.h \ - src/zerocoin/Coin.h \ - src/zerocoin/CoinSpend.h \ - src/zerocoin/Commitment.h \ - src/zerocoin/ParamGeneration.h \ - src/zerocoin/Params.h \ - src/zerocoin/SerialNumberSignatureOfKnowledge.h \ - src/zerocoin/SpendMetaData.h \ - src/zerocoin/ZeroTest.h \ - src/zerocoin/Zerocoin.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 \ @@ -255,6 +247,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 \ @@ -263,7 +256,10 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/rpcconsole.h \ src/version.h \ src/netbase.h \ - src/clientversion.h + src/clientversion.h \ + src/qt/multisigaddressentry.h \ + src/qt/multisiginputentry.h \ + src/qt/multisigdialog.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/transactiontablemodel.cpp \ @@ -277,6 +273,11 @@ 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 \ @@ -288,6 +289,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/miner.cpp \ src/init.cpp \ src/net.cpp \ + src/stun.cpp \ src/irc.cpp \ src/checkpoints.cpp \ src/addrman.cpp \ @@ -330,16 +332,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/kernel.cpp \ src/scrypt.cpp \ src/pbkdf2.cpp \ - src/zerocoin/Accumulator.cpp \ - src/zerocoin/AccumulatorProofOfKnowledge.cpp \ - src/zerocoin/Coin.cpp \ - src/zerocoin/CoinSpend.cpp \ - src/zerocoin/Commitment.cpp \ - src/zerocoin/ParamGeneration.cpp \ - src/zerocoin/Params.cpp \ - src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \ - src/zerocoin/SpendMetaData.cpp \ - src/zerocoin/ZeroTest.cpp + src/qt/multisigaddressentry.cpp \ + src/qt/multisiginputentry.cpp \ + src/qt/multisigdialog.cpp RESOURCES += \ src/qt/bitcoin.qrc @@ -356,7 +351,10 @@ 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 contains(USE_QRCODE, 1) { HEADERS += src/qt/qrcodedialog.h @@ -436,8 +434,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 @@ -453,7 +453,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 { @@ -462,4 +462,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)