Msvcwjb (Chia-Network#25)

* make things easier on msvc. replace VLA and fix gulrak header issue

* removed global nominmax

setup.py

@@ -135,7 +135,7 @@ def cpp_flag(compiler):
 class BuildExt(build_ext):
     """A custom build extension for adding compiler-specific options."""
     c_opts = {
-        'msvc': ['/EHsc','/std:c++17','/D','NOMINMAX','/O2'],
+        'msvc': ['/EHsc','/std:c++17','/O2'],
         'unix': [],
     }
     l_opts = {

src/cli.cpp

@@ -99,14 +99,15 @@ int main(int argc, char *argv[]) {
             }
             memo = Strip0x(memo);
             id = Strip0x(id);
-            uint8_t memo_bytes[memo.size() / 2];
+            uint8_t *memo_bytes = new uint8_t(memo.size() / 2);
             uint8_t id_bytes[32];
 
             HexToBytes(memo, memo_bytes);
             HexToBytes(id, id_bytes);
 
             DiskPlotter plotter = DiskPlotter();
             plotter.CreatePlotDisk(tempdir, tempdir, finaldir, filename, k, memo_bytes, memo.size() / 2, id_bytes, 32);
+            delete(memo_bytes);
         } else if (operation == "prove") {
             if (argc < 3) {
                 HelpAndQuit(options);
@@ -124,10 +125,11 @@ int main(int argc, char *argv[]) {
             vector<LargeBits> qualities = prover.GetQualitiesForChallenge(challenge_bytes);
             for (uint32_t i = 0; i < qualities.size(); i++) {
                 k = prover.GetSize() / 2;
-                uint8_t proof_data[8 * k];
+                uint8_t *proof_data = new uint8_t(8 * k);
                 LargeBits proof = prover.GetFullProof(challenge_bytes, i);
                 proof.ToBytes(proof_data);
                 cout << "Proof: 0x" << Util::HexStr(proof_data, k * 8) << endl;
+                delete proof_data;
             }
             if (qualities.empty()) {
                 cout << "No proofs found." << endl;
@@ -159,7 +161,7 @@ int main(int argc, char *argv[]) {
                  << static_cast<int>(k) << endl << endl;
             uint8_t id_bytes[32];
             uint8_t challenge_bytes[32];
-            uint8_t proof_bytes[proof.size() / 2];
+            uint8_t *proof_bytes = new uint8_t(proof.size() / 2);
             HexToBytes(id, id_bytes);
             HexToBytes(challenge, challenge_bytes);
             HexToBytes(proof, proof_bytes);
@@ -171,6 +173,7 @@ int main(int argc, char *argv[]) {
                 cout << "Proof verification failed." << endl;
                 exit(1);
             }
+            delete proof_bytes;
         } else if (operation == "check") {
             uint32_t iterations = 1000;
             if (argc == 3) {
@@ -195,7 +198,7 @@ int main(int argc, char *argv[]) {
                 vector<LargeBits> qualities = prover.GetQualitiesForChallenge(hash.data());
                 for (uint32_t i = 0; i < qualities.size(); i++) {
                     LargeBits proof = prover.GetFullProof(hash.data(), i);
-                    uint8_t proof_data[proof.GetSize() / 8];
+                    uint8_t *proof_data = new uint8_t(proof.GetSize() / 8);
                     proof.ToBytes(proof_data);
                     cout << "i: " << num << std::endl;
                     cout << "chalenge: 0x" << Util::HexStr(hash.data(), 256 / 8) << endl;
@@ -209,6 +212,7 @@ int main(int argc, char *argv[]) {
                         cout << "Proof verification failed." << endl;
                         exit(1);
                     }
+                    delete proof_data;
                 }
             }
             std::cout << "Total success: " << success << "/" << iterations << ", " <<

src/plotter_disk.hpp

@@ -28,6 +28,10 @@
 #include <string>
 #include <utility>
 
+// Gulrak filesystem brings in Windows headers that cause some issues with std
+#define _HAS_STD_BYTE 0
+#define NOMINMAX
+
 #include "../lib/include/filesystem.hh"
 namespace fs = ghc::filesystem;
 #include "util.hpp"