Add conditional compilation.

Build NETGENPLUGIN under Windows platform.
2021-10-11 13:30:49 +03:00 · 2021-10-08 11:50:58 +03:00
3 changed files with 6 additions and 1 deletions
--- a/src/NETGENPlugin/CMakeLists.txt
+++ b/src/NETGENPlugin/CMakeLists.txt
@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
  ${Boost_INCLUDE_DIRS}
  ${OMNIORB_INCLUDE_DIR}
  ${PROJECT_BINARY_DIR}/idl
+  ${NETGEN_ZLIB_INCLUDE_DIRS}
 )

 # additional preprocessor / compiler flags
--- a/src/NETGENPlugin/NETGENPlugin_Defs.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Defs.hxx
@ -35,7 +35,7 @@
    #define NETGENPLUGIN_EXPORT __declspec( dllimport )
  #endif

-  #if defined(NETGEN_V5)
+  #if defined(NETGEN_V5) || defined(NETGEN_V6)
    #define NETGENPLUGIN_DLL_HEADER DLL_HEADER
  #else
    #define NETGENPLUGIN_DLL_HEADER
--- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
@ -66,7 +66,11 @@ namespace netgen {
 namespace nglib
 {
  NETGENPLUGIN_DLL_HEADER
+#ifdef NETGEN_V6
+  extern netgen::NgArray<netgen::Point<3> > readedges;
+#else
  extern netgen::Array<netgen::Point<3> > readedges;
+#endif
 }

 namespace
Author	SHA1	Message	Date
rnv	8f273eb693	Add conditional compilation.	2021-10-11 13:30:49 +03:00
rnv	77c1c9be98	Build NETGENPLUGIN under Windows platform.	2021-10-08 11:50:58 +03:00