tenporaneo

ebertolazzi · Apr 6, 2022 · d69471f · d69471f
1 parent 721a051
commit d69471f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/toolbox/bin/BaseHermiteMexWrapper.m b/toolbox/bin/BaseHermiteMexWrapper.m
diff --git a/toolbox/bin/Spline1DMexWrapper.m b/toolbox/bin/Spline1DMexWrapper.m
diff --git a/toolbox/bin/Spline2DMexWrapper.m b/toolbox/bin/Spline2DMexWrapper.m
diff --git a/toolbox/bin/SplineSetMexWrapper.m b/toolbox/bin/SplineSetMexWrapper.m
diff --git a/toolbox/bin/SplineVecMexWrapper.m b/toolbox/bin/SplineVecMexWrapper.m
diff --git a/toolbox/lib/CMakeLists.txt b/toolbox/lib/CMakeLists.txt
@@ -21,9 +21,14 @@ endforeach()
 
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_SOURCE_DIR}/../src/Utils )
 
-if ( (UNIX OR LINUX) AND NOT APPLE )
-  set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-  set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+if ( UNIX OR LINUX )
+  if ( NOT APPLE )
+    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+    set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+  endif()
+else()
+  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
+  add_definitions(-mwindows)
 endif()
 
 set( MEX_LIST BaseHermite Spline1D Spline2D SplineSet SplineVec )
@@ -37,4 +42,7 @@ foreach( BASE ${MEX_LIST})
     "$<TARGET_FILE:${BASE}MexWrapper>"
     "${CMAKE_CURRENT_SOURCE_DIR}/../bin"
   )
+
+  target_link_libraries( ${BASE}MexWrapper ws2_32.lib iphlpapi.lib iphlpapi.lib kernel32.lib winpthread )
+
 endforeach()
diff --git a/toolbox/lib/CompileSplinesLib_cmake.m b/toolbox/lib/CompileSplinesLib_cmake.m
@@ -15,7 +15,14 @@
 end
 
 old_dir = cd(fileparts(which(mfilename)));
-system('cmake -Bbuild .');
-system('cmake --build build --parallel 8');
+%system('rmdir /S build');
+if isunix
+  system('cmake -Bbuild .');
+  system('cd build; make -j 10; cd ..');
+elseif ispc
+  system('cmake -G "MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Bbuild .');
+  system('cd build && make -j 10 && cd ..');
+end
+%system('cmake --build build --parallel 8');
 cd(old_dir);