Merge pull request #28 from VerusCoin/dev

Dev

.travis.yml

@@ -61,8 +61,8 @@ script:
 after_script:
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account
   --key-file AUTH_KEY.json; fi
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/komodo-build && cp $KOMODO_EXEC_SET
-  src/komodo-build && cd src && tar -czvf $COMPRESSED_BUILD komodo-build; fi
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET
+  src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/;
   fi
 notifications:

src/crypto/haraka.h

@@ -30,7 +30,11 @@ Optimized Implementations for Haraka256 and Haraka512
 
 #define NUMROUNDS 5
 
+#ifdef _WIN32
+typedef unsigned long long u64;
+#else
 typedef unsigned long u64;
+#endif
 typedef __m128i u128;
 
 extern u128 rc[40];

src/miner.cpp

@@ -1228,7 +1228,11 @@ void static BitcoinMiner_noeq()
 
                 if ((UintToArith256(pblock->nNonce) & mask) == mask)
                 {
+#ifdef _WIN32
+                    printf("%llu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576);
+#else
                     printf("%lu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576);
+#endif
                     break;
                 }