X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=efefa8e0558eeb0a3235330b8e06795e40d9ecf3;hb=92948780909cc9e3349409d6102dbe5adf1d5a10;hp=de9d4112fbcdb29d9ad4535b6d1f61b44cd6e468;hpb=ecfb608bb8dd6719b80d097ec4e2755cd373777f;p=novacoin.git

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index de9d411..efefa8e 100644
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -135,22 +135,20 @@ contains(USE_LEVELDB, 1) {
 
 # use: qmake "USE_ASM=1"
 contains(USE_ASM, 1) {
-    message(Using assembler 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 {
     # use: qmake "USE_SSE2=1"
     contains(USE_SSE2, 1) {
         message(Using SSE2 intrinsic scrypt implementation)
-        SOURCES += src/scrypt-sse2.cpp
+        SOURCES += src/scrypt-intrin/scrypt-sse2.cpp
         DEFINES += USE_SSE2
         QMAKE_CXXFLAGS += -msse2
         QMAKE_CFLAGS += -msse2
     } else {
-        message(Using generic scrypt core implementation)
+        message(Using generic scrypt implementation)
+        SOURCES += src/scrypt-generic.cpp
     }
-
-    # For now, generic module is required in both cases
-    SOURCES += src/scrypt-generic.c
 }
 
 # regenerate src/build.h
@@ -183,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 \
@@ -273,6 +272,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 \
@@ -341,7 +341,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/rpcconsole.cpp \
     src/noui.cpp \
     src/kernel.cpp \
-    src/scrypt.cpp \
     src/qt/multisigaddressentry.cpp \
     src/qt/multisiginputentry.cpp \
     src/qt/multisigdialog.cpp
@@ -350,6 +349,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 \