Merge pull request YosysHQ#109 from xobs/msvc-2019-fixes

Fix building for MSVC 2019 and static Windows builds
f4pga · Oct 18, 2019 · 72fe507 · 72fe507
2 parents e2e10bf + 089efdc
commit 72fe507
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/libtrellis/CMakeLists.txt b/libtrellis/CMakeLists.txt
@@ -15,7 +15,11 @@ set(CMAKE_DEFIN)
 set(link_param "")
 if (STATIC_BUILD)
     set(Boost_USE_STATIC_LIBS ON)
-    if (NOT APPLE)
+    if(MSVC)
+        add_definitions(-DBOOST_PYTHON_STATIC_LIB)
+        set(CMAKE_CXX_FLAGS_RELEASE "/MT")
+        set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
+    elseif (NOT APPLE)
         set(link_param "-static")
     endif()
 else()

diff --git a/libtrellis/src/CRAM.cpp b/libtrellis/src/CRAM.cpp
@@ -1,5 +1,6 @@
 #include "CRAM.hpp"
 #include <cassert>
+#include <stdexcept>
 
 namespace Trellis {
 char &CRAMView::bit(int frame, int bit) const {

diff --git a/libtrellis/tools/ecpbram.cpp b/libtrellis/tools/ecpbram.cpp
@@ -17,11 +17,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <assert.h>
 #include <stdint.h>
+#ifdef _WIN32
+#define NOMINMAX
+#include "Windows.h"
+#undef NOMINMAX
+#else
+#include <unistd.h>
 #include <sys/time.h>
+#endif
 
 #include <map>
 #include <vector>
@@ -97,8 +103,11 @@ void parse_hexfile_line(const char *filename, int linenr, vector<vector<bool>> &
 int main(int argc, char **argv)
 {
     bool verbose = false;
+#ifdef _WIN32
+    uint32_t seed_nr = GetCurrentProcessId();
+#else
     uint32_t seed_nr = getpid();
-
+#endif
     namespace po = boost::program_options;
 
     std::string database_folder = get_database_path();;
@@ -186,10 +195,20 @@ int main(int argc, char **argv)
         xorshift64star();
 
         if (!vm.count("seed")) {
+#ifdef _WIN32
+            SYSTEMTIME system_time;
+            FILETIME file_time;
+            uint64_t time;
+            GetSystemTime(&system_time);
+            SystemTimeToFileTime(&system_time, &file_time);
+            x ^= uint64_t(file_time.dwLowDateTime);
+            x ^= uint64_t(file_time.dwHighDateTime) << 32;
+#else
             struct timeval tv;
             gettimeofday(&tv, NULL);
             x ^= uint64_t(tv.tv_sec) << 20;
             x ^= uint64_t(tv.tv_usec);
+#endif
         }
 
         xorshift64star();