X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=novacoin-qt.pro;h=16277f72ebe5cbc612471e3edd16abc34fad7451;hp=36435531f859fc0b390bfa9ceac2ed46099165ba;hb=8e064484abe4d65e15e3ec1bcdbb2b91f97dd726;hpb=f9b0c909fcd5c7840dce02568aa4da9078cfb2b3 diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 3643553..16277f7 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -9,16 +9,21 @@ CONFIG += no_include_pwd CONFIG += thread CONFIG += static +# QMAKE_CC=clang +# QMAKE_CXX=clang++ +# QMAKE_LINK=clang++ + freebsd-g++: QMAKE_TARGET.arch = $$QMAKE_HOST.arch 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 # for boost thread win32 with _win32 sufix # use: BOOST_THREAD_LIB_SUFFIX=_win32-... -# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8 +# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-6.1 # Dependency library locations can be customized with: # BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH, @@ -29,8 +34,8 @@ linux-g++-64: QMAKE_TARGET.arch = x86_64 #BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib #BDB_INCLUDE_PATH=C:/deps/db-6.0.20/build_unix #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 +#OPENSSL_INCLUDE_PATH=C:/d1eps/openssl-1.0.2g/include +#OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2g #QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4 #QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs @@ -40,12 +45,24 @@ UI_DIR = build # use: qmake "RELEASE=1" contains(RELEASE, 1) { + macx:QMAKE_CXXFLAGS += -isysroot /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -mmacosx-version-min=10.7 + macx:QMAKE_CFLAGS += -isysroot /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -mmacosx-version-min=10.7 + macx:QMAKE_OBJECTIVE_CFLAGS += -isysroot /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -mmacosx-version-min=10.7 + !windows:!macx { # Linux: static link LIBS += -Wl,-Bstatic } } +contains(DEBUG, 1) { + QMAKE_CXXFLAGS -= -O2 + QMAKE_CFLAGS -= -O2 + + QMAKE_CFLAGS += -g -O0 + QMAKE_CXXCFLAGS += -g -O0 +} + !win32 { # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 @@ -58,6 +75,14 @@ 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_DBUS=1" contains(USE_DBUS, 1) { message(Building with DBUS (Freedesktop notifications) support) @@ -114,39 +139,27 @@ contains(USE_LEVELDB, 1) { # 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, i586) | - contains(QMAKE_TARGET.arch, i686) { - message("x86 platform, setting -msse2 & -mssse3 flags") - - 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") + contains(QMAKE_TARGET.arch, i386) | contains(QMAKE_TARGET.arch, i586) | contains(QMAKE_TARGET.arch, i686) { + message("x86 platform, setting -msse2 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 } } @@ -170,7 +183,7 @@ contains(USE_O3, 1) { } -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 @@ -266,7 +279,8 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/multisiginputentry.h \ src/qt/multisigdialog.h \ src/qt/secondauthdialog.h \ - src/qt/qrcodedialog.h + src/ies.h \ + src/ipcollector.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/intro.cpp \ @@ -319,6 +333,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/transactionview.cpp \ src/qt/walletmodel.cpp \ src/bitcoinrpc.cpp \ + src/rpccrypt.cpp \ src/rpcdump.cpp \ src/rpcnet.cpp \ src/rpcmining.cpp \ @@ -344,7 +359,10 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/multisiginputentry.cpp \ src/qt/multisigdialog.cpp \ src/qt/secondauthdialog.cpp \ - src/qt/qrcodedialog.cpp + src/base58.cpp \ + src/cryptogram.cpp \ + src/ecies.cpp \ + src/ipcollector.cpp RESOURCES += \ src/qt/bitcoin.qrc @@ -366,8 +384,13 @@ FORMS += \ src/qt/forms/multisigaddressentry.ui \ src/qt/forms/multisiginputentry.ui \ src/qt/forms/multisigdialog.ui \ - src/qt/forms/secondauthdialog.ui \ - src/qt/forms/qrcodedialog.ui + src/qt/forms/secondauthdialog.ui + +contains(USE_QRCODE, 1) { + HEADERS += src/qt/qrcodedialog.h + SOURCES += src/qt/qrcodedialog.cpp + FORMS += src/qt/forms/qrcodedialog.ui +} CODECFORTR = UTF-8 @@ -394,8 +417,8 @@ OTHER_FILES += \ # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { - macx:BOOST_LIB_SUFFIX = -mt windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_53 + macx:BOOST_LIB_SUFFIX = -mt } isEmpty(BOOST_THREAD_LIB_SUFFIX) { @@ -403,15 +426,23 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) { } isEmpty(BDB_LIB_PATH) { - macx:BDB_LIB_PATH = /opt/local/lib/db48 + macx:BDB_LIB_PATH = /usr/local/BerkeleyDB.6.1/lib +} + +isEmpty(OPENSSL_LIB_PATH) { + macx:OPENSSL_LIB_PATH = /opt/local/lib } isEmpty(BDB_LIB_SUFFIX) { - macx:BDB_LIB_SUFFIX = -4.8 + macx:BDB_LIB_SUFFIX = -6.0 } isEmpty(BDB_INCLUDE_PATH) { - macx:BDB_INCLUDE_PATH = /opt/local/include/db48 + macx:BDB_INCLUDE_PATH = /opt/local/include/db60 +} + +isEmpty(OPENSSL_INCLUDE_PATH) { + macx:OPENSSL_INCLUDE_PATH = /opt/local/include } isEmpty(BOOST_LIB_PATH) { @@ -456,7 +487,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 += -lqrencode -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX +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