Revert "выбор папки для базы блоков из GUI"

[novacoin.git] / novacoin-qt.pro

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index 773b7bb..de9d411 100644 (file)
--- 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
@@ -133,11 +133,23 @@ contains(USE_LEVELDB, 1) {
     SOURCES += src/txdb-bdb.cpp
 }
 
+# use: qmake "USE_ASM=1"
 contains(USE_ASM, 1) {
-    message(Using optimized scrypt core implementation)
+    message(Using assembler scrypt core implementation)
     SOURCES += src/scrypt-arm.S src/scrypt-x86.S src/scrypt-x86_64.S
 } else {
-    message(Using generic scrypt core implementation)
+    # use: qmake "USE_SSE2=1"
+    contains(USE_SSE2, 1) {
+        message(Using SSE2 intrinsic scrypt implementation)
+        SOURCES += src/scrypt-sse2.cpp
+        DEFINES += USE_SSE2
+        QMAKE_CXXFLAGS += -msse2
+        QMAKE_CFLAGS += -msse2
+    } else {
+        message(Using generic scrypt core implementation)
+    }
+
+    # For now, generic module is required in both cases
     SOURCES += src/scrypt-generic.c
 }
 
@@ -200,7 +212,6 @@ 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 \
@@ -331,7 +342,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.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