X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=d43cf89bf2b551f55ba045dd615fbaca67182835;hb=f0f3cf8e4b67fecaeafaf82b520d6c357c5aa1e8;hp=670271b6d867f0d733a408270a68231f1805bc6e;hpb=2c2b3a2cbae57fd257da487c8903b6e72eb61291;p=novacoin.git

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index 670271b..d43cf89 100644
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -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
 }
 
@@ -171,6 +183,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 \
@@ -200,7 +213,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 \
@@ -262,6 +274,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/multisigdialog.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 \
@@ -331,7 +344,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
@@ -340,6 +352,7 @@ 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 \