From 7c21eb94c720197ad0969c643691a2027633965a Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Wed, 22 Jul 2009 18:13:50 +0000 Subject: [PATCH] windows fixes --- libsrc/geom2d/splinegeometry.cpp | 2 ++ libsrc/geom2d/splinegeometry.hpp | 2 +- libsrc/include/mydefs.hpp | 2 +- windows/Makefile.am | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libsrc/geom2d/splinegeometry.cpp b/libsrc/geom2d/splinegeometry.cpp index 7d3ab5e6..90b2c023 100644 --- a/libsrc/geom2d/splinegeometry.cpp +++ b/libsrc/geom2d/splinegeometry.cpp @@ -1127,12 +1127,14 @@ template void SplineGeometry :: SetGrading (const double grading) { elto0 = grading;} +/* template void SplineGeometry :: AppendPoint (const double x, const double y, const double reffac, const bool hpref) { geompoints.Append (GeomPoint(x, y, reffac)); geompoints.Last().hpref = hpref; } +*/ template void SplineGeometry :: AppendPoint (const Point & p, const double reffac, const bool hpref) diff --git a/libsrc/geom2d/splinegeometry.hpp b/libsrc/geom2d/splinegeometry.hpp index 6096f8ce..b04dd366 100644 --- a/libsrc/geom2d/splinegeometry.hpp +++ b/libsrc/geom2d/splinegeometry.hpp @@ -84,7 +84,7 @@ public: const GeomPoint & GetPoint(int i) const { return geompoints[i]; } void SetGrading (const double grading); - void AppendPoint (const double x, const double y, const double reffac = 1., const bool hpref = false); + // void AppendPoint (const double x, const double y, const double reffac = 1., const bool hpref = false); void AppendPoint (const Point & p, const double reffac = 1., const bool hpref = false); void AppendLineSegment (const int n1, const int n2, diff --git a/libsrc/include/mydefs.hpp b/libsrc/include/mydefs.hpp index 824654a3..3fe4b1c8 100644 --- a/libsrc/include/mydefs.hpp +++ b/libsrc/include/mydefs.hpp @@ -20,7 +20,7 @@ // in the configure/make phases, with the // right version number #ifdef WIN32 -#define PACKAGE_VERSION "4.9.9" +#define PACKAGE_VERSION "4.9.10" #endif diff --git a/windows/Makefile.am b/windows/Makefile.am index 58d22f93..109ebe34 100644 --- a/windows/Makefile.am +++ b/windows/Makefile.am @@ -1,3 +1,7 @@ -dist_noinst_DATA = netgen.sln netgen.vcproj netgen_MSVC2005.sln netgen_MSVC2005.vcproj postBuild_netgen.bat nglib.sln nglib.vcproj nglib_MSVC2005.sln nglib_MSVC2005.vcproj postBuild_nglib.bat +dist_noinst_DATA = netgen.sln netgen.vcproj netgen_MSVC2005.sln \ +netgen_MSVC2005.vcproj postBuild_netgen.bat nglib.sln nglib.vcproj \ +nglib_MSVC2005.sln nglib_MSVC2005.vcproj postBuild_nglib.bat \ +netgen.ico netgen.rc +