Build NETGENPLUGIN under Windows platform with Netgen-6

diff --git a/src/NETGENPlugin/CMakeLists.txt b/src/NETGENPlugin/CMakeLists.txt
index fc5940668a870a80bcae04488d9801cf441c2d27..c882e142a7a9e6fe64ea0c141e1c972179c50a2a 100644 (file)
--- 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

diff --git a/src/NETGENPlugin/NETGENPlugin_Defs.hxx b/src/NETGENPlugin/NETGENPlugin_Defs.hxx
index 7ceb67b00187da910c8d9870169536f0ffa5d9af..734b2354e096c6edbc57007c994fd80dbe9fe0dd 100644 (file)
--- 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

diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
index 5851a777c2cdf30bb47e33f9901120d81c307f24..e35168dc55aa2cc29717e75e356c02ac3d897dff 100644 (file)
--- 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