Merge pull request #78 from Nexusoft/2.4.6

2.4.6 Merge to Master

README.md

@@ -1,4 +1,4 @@
-Nexus Core - 0.2.4.5
+Nexus Core - 0.2.4.6
 =====================================
 
 nex·usˈneksəs' : a connection or series of connections linking two or more things.

makefile.cli

@@ -283,7 +283,7 @@ CXXFLAGS+= -mthreads \
 	$(INCLUDEPATHS)
 
 #set -std=c++ for all but c compiling
-CFLAGS:= $(CXXFLGS)
+CFLAGS:= $(CXXFLAGS)
 CXXFLAGS+=-std=c++11
 
 #OS Specific Targets and instructions
@@ -363,7 +363,7 @@ CXXFLAGS+= -mmacosx-version-min=10.10 \
 	$(INCLUDEPATHS)
 
 #set -std=c++ for all but c compiling
-CFLAGS:= $(CXXFLGS)
+CFLAGS:= $(CXXFLAGS)
 CXXFLAGS+=-std=c++11
 
 #OS Specific Targets and instructions
@@ -488,7 +488,7 @@ CXXFLAGS+= -O3 \
 	$(INCLUDEPATHS)
 
 #set -std=c++ for all but c compiling
-CFLAGS:= $(CXXFLGS)
+CFLAGS:= $(CXXFLAGS)
 CXXFLAGS+=-std=c++11
 
 #OS Specific Targets and instructions

nexus-qt.pro

@@ -3,9 +3,9 @@ TARGET = nexus-qt
 VERSION = 0.1.0.0
 INCLUDEPATH += src src/core src/hash src/json src/net src/qt src/util src/wallet src/LLD src/LLP
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
-CONFIG += no_include_pwd optimize_full
+CONFIG += no_include_pwd optimize_full c++11
 greaterThan(QT_MAJOR_VERSION, 4) {
-	QT += uitools
+	QT += uitools widgets
 }
 OBJECTS_DIR = build/obj
 MOC_DIR = build/moc
@@ -149,7 +149,7 @@ contains(RELEASE, 1) {
     #Static Configuration
     win32:CONFIG += STATIC
 
-    win32:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat -static -m64 -std=c++11 -static-libgcc -static-libstdc++
+    win32:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat -static -static-libgcc -static-libstdc++
     !win32:!macx {
         # Linux: static link
         LIBS += -Wl,-Bstatic
@@ -215,7 +215,7 @@ contains(NEXUS_NEED_QT_PLUGINS, 1) {
 
 !macx:QMAKE_LFLAGS += -s
 QMAKE_CFLAGS += -s
-QMAKE_CXXFLAGS += -s -std=c++11 -D_FORTIFY_SOURCE=2 -fpermissive
+QMAKE_CXXFLAGS += -s -D_FORTIFY_SOURCE=2 -fpermissive
 QMAKE_CXXFLAGS_WARN_ON = -Wall -Wextra -Wformat -Wformat-security -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-parameter
 !macx {
     QMAKE_CXXFLAGS_WARN_ON += -fdiagnostics-show-option
@@ -505,7 +505,7 @@ contains(ARCH_TEST, ARCH) {
 !build_pass:message("Finishing up... Type 'make' to start compiling when finished")
 #Ending makefile text
 complete.target= complete
-win32:complete.commands= { echo -e '\nFinished Building nexus-qt.exe\n'; } 2> /dev/null
+win32:complete.commands= @echo '' && echo 'Finished Building nexus-qt.exe' && echo ''
 macx:complete.commands= { echo ' '; echo 'Finished building nexus-qt.app'; echo ' '; } 2> /dev/null
 !win32:!macx:complete.commands= { echo -e '\nFinished Building nexus-qt\n'; } 2> /dev/null
 QMAKE_EXTRA_TARGETS+= complete