Add static linking for windows exe. Remove mingw build. Add copyright notices for fpconv to exe output.

2 files changed, 9 insertions, 2 deletions

diff --git a/ArcWelderConsole/ArcWelderConsole.cpp b/ArcWelderConsole/ArcWelderConsole.cpp
index b301237..3b3c03b 100644
--- a/ArcWelderConsole/ArcWelderConsole.cpp
+++ b/ArcWelderConsole/ArcWelderConsole.cpp
@@ -61,6 +61,8 @@ int main(int argc, char* argv[])
   info.append(", Branch: ").append(GIT_BRANCH);
   info.append(", BuildDate: ").append(BUILD_DATE);
   info.append("\n").append("Copyright(C) ").append(COPYRIGHT_DATE).append(" - ").append(AUTHOR);
+  info.append("\n").append("An algorithm for producing fast floating point strings, fpconv, was added with the following notice:  Copyright (C) 2014 Milo Yip");
+  info.append("\n").append("The original fpconv algorithm provides the following notice: Copyright(c) 2013 Andreas Samoljuk");
   
   std::stringstream arg_description_stream;
   
diff --git a/ArcWelderConsole/CMakeLists.txt b/ArcWelderConsole/CMakeLists.txt
index 6ce4b2c..0859c5b 100644
--- a/ArcWelderConsole/CMakeLists.txt
+++ b/ArcWelderConsole/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION "3.13")
+cmake_minimum_required (VERSION "3.15")
 
 project(ArcWelderConsole C CXX)
 
@@ -13,6 +13,10 @@ include_directories(${GcodeProcessorLib_INCLUDE_DIRS} ${ArcWelder_INCLUDE_DIRS}
 # ArcWelderConsoleSources variable
 include(sourcelist.cmake)
 
+if(MSVC)
+    # link to the msvc runtime statically, keeping debug info if we are in debug config
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
 
 # Add an executable our ArcWelderConsoleSources variable from our sourcelist file
 add_executable(${PROJECT_NAME} ${ArcWelderConsoleSources})
@@ -25,9 +29,10 @@ install(
     DESTINATION bin
 )
 
-
 # specify linking to the GcodeProcessorLib and ArcWelder libraries
 target_link_libraries(${PROJECT_NAME} GcodeProcessorLib ArcWelder TCLAP)
 
 
 
+
+