[fix] windows build - fix linkage errors

Signed-off-by: Anton Dukhovnikov <[email protected]>
AcademySoftwareFoundation · Nov 11, 2023 · 28adaae · 28adaae
1 parent 4023923
commit 28adaae
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ set( CMAKE_MACOSX_RPATH 1 )
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 #    set(warnings "/W4 /WX /EHsc")
-    add_compile_options ( /w0 )
+    add_compile_options ( /W0 )
     add_compile_definitions( NOMINMAX )
 endif()
 

diff --git a/include/rawtoaces/define.h b/include/rawtoaces/define.h
@@ -353,7 +353,7 @@ inline vector < string > openDir ( string path = "." ) {
     for (auto & i : boost::filesystem::directory_iterator(path))
     {
         if (i.status().type() != boost::filesystem::file_type::directory_file)
-            paths.push_back(i.path().c_str());
+            paths.push_back(i.path().string());
     }
 
     return paths;

diff --git a/unittest/testIDT.cpp b/unittest/testIDT.cpp
@@ -52,6 +52,11 @@
 // THAN A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>

diff --git a/unittest/testMath.cpp b/unittest/testMath.cpp
@@ -52,6 +52,12 @@
 // THAN A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32
+#    define WIN32_LEAN_AND_MEAN
+#    include<windows.h>
+#    undef RGB
+#endif
+
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>

diff --git a/unittest/testSpst.cpp b/unittest/testSpst.cpp
@@ -52,6 +52,11 @@
 // THAN A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
+#endif
+
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>