From 6a142a7b4ef7a485193383d00cfc7aa96e967d5c Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 19 Dec 2011 12:53:49 +0000 Subject: [PATCH] fix win compile --- contrib/Netgen/README.txt | 9 ++++++--- contrib/Netgen/nglib/nglib.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/Netgen/README.txt b/contrib/Netgen/README.txt index e150ef243c..314fff0e0c 100644 --- a/contrib/Netgen/README.txt +++ b/contrib/Netgen/README.txt @@ -1,10 +1,13 @@ This directory contains Joachim Sch\"oberl's NETGEN mesh generator: -- the libsrc and nglib directories are unmodified copies taken from +The libsrc and nglib directories are unmodified copies taken from + svn co https://netgen-mesher.svn.sourceforge.net/svnroot/netgen-mesher - (SVN rev. 469) -- the nglib_gmsh.cpp file replaces the original nglib/nglib.cpp file +(SVN rev. 469), with the following exceptions: + +* dllexport/dllimport directives have been removed from nglib/nglib.h +* nglib_gmsh.cpp file replaces the original nglib/nglib.cpp file See the LICENSE file for license information. diff --git a/contrib/Netgen/nglib/nglib.h b/contrib/Netgen/nglib/nglib.h index be9edb7b7a..a3bb606288 100644 --- a/contrib/Netgen/nglib/nglib.h +++ b/contrib/Netgen/nglib/nglib.h @@ -23,7 +23,8 @@ // Philippose - 14.02.2009 // Modifications for creating a DLL in Windows -#ifdef WIN32 +//#ifdef WIN32 +#if 0 // for GMSH #ifdef NGLIB_EXPORTS || nglib_EXPORTS #define DLL_HEADER __declspec(dllexport) #else -- GitLab