X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=novacoin-qt.pro;h=36435531f859fc0b390bfa9ceac2ed46099165ba;hb=f9b0c909fcd5c7840dce02568aa4da9078cfb2b3;hp=25f6bc5e8a976502b8b2cccc3b1523a637c2c136;hpb=1c7ed42093c5935e3958584ed98a2b03466a0023;p=novacoin.git

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index 25f6bc5..3643553 100644
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -9,6 +9,11 @@ CONFIG += no_include_pwd
 CONFIG += thread
 CONFIG += static
 
+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
+
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
 # for boost thread win32 with _win32 sufix
@@ -106,19 +111,30 @@ contains(USE_LEVELDB, 1) {
     SOURCES += src/txdb-bdb.cpp
 }
 
+
 # use: qmake "USE_ASM=1"
 contains(USE_ASM, 1) {
     message(Using assembler scrypt & sha256 implementations)
     DEFINES += USE_ASM
-    QMAKE_CFLAGS += -msse2
-    QMAKE_CXXFLAGS += -msse2
 
-    contains(USE_SSSE3, 1) {
-        DEFINES += USE_SSSE3
-        QMAKE_CFLAGS += -mssse3
+     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")
+
         QMAKE_CXXFLAGS += -mssse3
+        QMAKE_CFLAGS += -mssse3
     }
 
+
     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 {
@@ -153,12 +169,6 @@ contains(USE_O3, 1) {
     QMAKE_CFLAGS += -O3
 }
 
-*-g++-32 {
-    message("32 platform, adding -msse2 flag")
-
-    QMAKE_CXXFLAGS += -msse2
-    QMAKE_CFLAGS += -msse2
-}
 
 QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
 
@@ -194,6 +204,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/hash.h \
     src/uint256.h \
     src/kernel.h \
+    src/kernel_worker.h \
     src/scrypt.h \
     src/serialize.h \
     src/main.h \
@@ -328,6 +339,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/rpcconsole.cpp \
     src/noui.cpp \
     src/kernel.cpp \
+    src/kernel_worker.cpp \
     src/qt/multisigaddressentry.cpp \
     src/qt/multisiginputentry.cpp \
     src/qt/multisigdialog.cpp \