From 14bbe7c9bf2fe94f0cbb03f803cabf3f63162462 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 26 May 2016 16:30:38 +0300 Subject: [PATCH] Correct a patch to be able to use native Togl --- src/NETGEN/netgen49ForSalome.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/NETGEN/netgen49ForSalome.patch diff --git a/src/NETGEN/netgen49ForSalome.patch b/src/NETGEN/netgen49ForSalome.patch old mode 100644 new mode 100755 index 5fa8499..022bd21 --- a/src/NETGEN/netgen49ForSalome.patch +++ b/src/NETGEN/netgen49ForSalome.patch @@ -472,7 +472,7 @@ diff -Naur netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp netgen-4.9.13_new/libsrc // (*testout) << "edge " << mesh.LineSegment(i).edgenr << " face " << mesh.LineSegment(i).si // << " p1 " << mesh.LineSegment(i)[0] << " p2 " << mesh.LineSegment(i)[1] << endl; // exit(10); -+ for (int j = 1; j <= mesh.GetNP(); j++) // to support SALOME fuse edges: set level to zero ++ for (int j = 1; j <= mesh.GetNP(); j++) // to support SALOME fuse edges: set level to zero + mesh.Point(j) = MeshPoint( (Point<3>&) mesh.Point(j) ); mesh.CalcSurfacesOfNode(); @@ -1095,6 +1095,18 @@ diff -Naur netgen-4.9.13_orig/libsrc/stlgeom/stlgeommesh.cpp netgen-4.9.13_new/l } else { +diff -Naur netgen-4.9.13_orig/ng/Makefile.in netgen-4.9.13_new/ng/Makefile.in +--- netgen-4.9.13_orig/ng/Makefile.in 2010-05-21 01:29:28.000000000 +0200 ++++ netgen-4.9.13_new/ng/Makefile.in 2016-05-26 14:39:47.128141997 +0200 +@@ -287,7 +287,7 @@ + $(top_builddir)/libsrc/gprim/libgprim.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgen.la \ +- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) ++ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) + + + # add for static linkage of ngsolve: diff -Naur netgen-4.9.13_orig/nglib/nglib.h netgen-4.9.13_new/nglib/nglib.h --- netgen-4.9.13_orig/nglib/nglib.h 2010-05-18 15:20:25.000000000 +0400 +++ netgen-4.9.13_new/nglib/nglib.h 2014-07-22 13:01:28.000000000 +0400 -- 2.39.2