Build NETGENPLUGIN under Windows platform with Netgen-6

This commit is contained in:
rnv 2021-10-08 11:50:58 +03:00
parent a8606239fd
commit d16cff04dd
3 changed files with 6 additions and 1 deletions

View File

@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/idl
${NETGEN_ZLIB_INCLUDE_DIRS}
) )
# additional preprocessor / compiler flags # additional preprocessor / compiler flags

View File

@ -35,7 +35,7 @@
#define NETGENPLUGIN_EXPORT __declspec( dllimport ) #define NETGENPLUGIN_EXPORT __declspec( dllimport )
#endif #endif
#if defined(NETGEN_V5) #if defined(NETGEN_V5) || defined(NETGEN_V6)
#define NETGENPLUGIN_DLL_HEADER DLL_HEADER #define NETGENPLUGIN_DLL_HEADER DLL_HEADER
#else #else
#define NETGENPLUGIN_DLL_HEADER #define NETGENPLUGIN_DLL_HEADER

View File

@ -66,7 +66,11 @@ namespace netgen {
namespace nglib namespace nglib
{ {
NETGENPLUGIN_DLL_HEADER NETGENPLUGIN_DLL_HEADER
#ifdef NETGEN_V6
extern netgen::NgArray<netgen::Point<3> > readedges;
#else
extern netgen::Array<netgen::Point<3> > readedges; extern netgen::Array<netgen::Point<3> > readedges;
#endif
} }
namespace namespace