From 6eaae6196cca762ed4e46f6f4011000e07e6577b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 4 Jul 2018 12:23:25 +0200 Subject: Fixed debug msvc build and fixed inaccessible base --- CMakeLists.txt | 4 ++-- common/nextpnr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 088d13e5..6485ebdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,8 +128,8 @@ if(MINGW) endif(MINGW) if (MSVC) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /DNDEBUG /O2 /MT") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Od /MTd") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /DNDEBUG /O2 /MD") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Od /MDd") endif() foreach (family ${FAMILIES}) diff --git a/common/nextpnr.h b/common/nextpnr.h index 1c7571cc..9d46b654 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -61,7 +61,7 @@ NEXTPNR_NAMESPACE_BEGIN -class assertion_failure : std::runtime_error +class assertion_failure : public std::runtime_error { public: assertion_failure(std::string msg, std::string expr_str, std::string filename, int line); -- cgit v1.2.3