setup to compile on windows

ebertolazzi · Feb 12, 2023 · 115faa6 · 115faa6
1 parent 794a39c
commit 115faa6
Show file tree

Hide file tree

Showing 17 changed files with 124 additions and 10 deletions.
diff --git a/toolbox/lib/CompileClothoidsLib.m b/toolbox/lib/CompileClothoidsLib.m
@@ -28,7 +28,7 @@
 %DEFS  = '-DG2LIB_DEBUG ';
 DEFS  = ' ';
 
-CMDBASE = [ 'mex -c -largeArrayDims -Isrc -Isrc/Utils ', DEFS];
+CMDBASE = [ 'mex -largeArrayDims -Isrc -Isrc/Utils ', DEFS];
 if isunix
   CMDBASE = [CMDBASE, 'CXXFLAGS="\$CXXFLAGS -Wall -O2 -g" '];
 elseif ispc
@@ -76,7 +76,7 @@
       ' LINKLIBS="-ldl -L\$MATLABROOT/bin/\$ARCH -L\$MATLABROOT/extern/bin/\$ARCH -lMatlabDataArray -lmx -lmex -lmat -lm "' ...
     ];
   elseif ispc
-    CMD = [CMD, 'COMPFLAGS="\$COMPFLAGS -O2" '];
+    CMD = [CMD, 'COMPFLAGS="\$COMPFLAGS /O2" '];
   end
 
   disp(CMD);

diff --git a/toolbox/src/Clothoid.cc b/toolbox/src/Clothoid.cc
@@ -144,6 +144,12 @@ namespace G2lib {
     m_aabb_done   = false;
   }
 
+  real_type
+  ClothoidCurve::length_ISO( real_type ) const {
+    UTILS_ERROR0( "Offset length not available for Clothoids\n" );
+    return 0;
+  }
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
   void

diff --git a/toolbox/src/Clothoids/Clothoid.hxx b/toolbox/src/Clothoids/Clothoid.hxx
@@ -693,10 +693,7 @@ namespace G2lib {
     { return m_L; }
 
     real_type
-    length_ISO( real_type ) const override {
-      UTILS_ERROR0( "Offset length not available for Clothoids\n" );
-      return 0;
-    }
+    length_ISO( real_type ) const override;
 
     real_type theta_begin()  const override { return m_CD.m_theta0; }
     real_type kappa_begin()  const override { return m_CD.m_kappa0; }

diff --git a/toolbox/src/Clothoids/PolyLine.hxx b/toolbox/src/Clothoids/PolyLine.hxx
@@ -191,10 +191,7 @@ namespace G2lib {
     { return m_s0.back(); }
 
     real_type
-    length_ISO( real_type ) const override {
-      UTILS_ERROR0( "PolyLine::length( offs ) not available!\n" );
-      return 0;
-    }
+    length_ISO( real_type ) const override;
 
     real_type
     x_begin() const override

diff --git a/toolbox/src/PolyLine.cc b/toolbox/src/PolyLine.cc
@@ -124,6 +124,12 @@ namespace G2lib {
     this->push_back( PL, tol );
   }
 
+  real_type
+  PolyLine::length_ISO( real_type ) const {
+    UTILS_ERROR0( "PolyLine::length( offs ) not available!\n" );
+    return 0;
+  }
+
   // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   int_type

diff --git a/toolbox/src_mex/mex_BiarcListMexWrapper.cc b/toolbox/src_mex/mex_BiarcListMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_BiarcMexWrapper.cc b/toolbox/src_mex/mex_BiarcMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_CircleArcMexWrapper.cc b/toolbox/src_mex/mex_CircleArcMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_ClothoidCurveMexWrapper.cc b/toolbox/src_mex/mex_ClothoidCurveMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_ClothoidListMexWrapper.cc b/toolbox/src_mex/mex_ClothoidListMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_ClothoidSplineG2MexWrapper.cc b/toolbox/src_mex/mex_ClothoidSplineG2MexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_FresnelCS.cc b/toolbox/src_mex/mex_FresnelCS.cc
@@ -11,6 +11,15 @@
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #define MEX_ERROR_MESSAGE \
 "======================================================================\n" \
 "\n" \

diff --git a/toolbox/src_mex/mex_LineSegmentMexWrapper.cc b/toolbox/src_mex/mex_LineSegmentMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_PolyLineMexWrapper.cc b/toolbox/src_mex/mex_PolyLineMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_TriTriOverlap.cc b/toolbox/src_mex/mex_TriTriOverlap.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 

diff --git a/toolbox/src_mex/mex_Triangle2DMexWrapper.cc b/toolbox/src_mex/mex_Triangle2DMexWrapper.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"
 #include "mex_info.hxx"

diff --git a/toolbox/src_mex/mex_XY_to_angle.cc b/toolbox/src_mex/mex_XY_to_angle.cc
@@ -12,6 +12,15 @@
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 #endif
 
+#ifdef _MSC_VER
+  #pragma comment(lib, "IPHLPAPI.lib")
+  #pragma comment(lib, "ws2_32.lib")
+  #pragma comment(lib, "Shlwapi.lib")
+  #pragma comment(lib, "Advapi32.lib")
+  #pragma comment(lib, "Shell32.lib")
+  #pragma comment(lib, "kernel32.lib")
+#endif
+
 #include "Clothoids.hh"
 #include "Utils_mex.hh"