|
 |
679c1a8 |
diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
|
|
|
679c1a8 |
--- netgen-5.3.1/configure.ac 2014-10-07 21:38:21.990021106 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/configure.ac 2014-10-07 21:39:14.530034275 +0200
|
|
|
accac45 |
@@ -35,15 +35,15 @@ AC_ARG_WITH([occ],
|
|
|
8fe3486 |
[AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])],
|
|
|
8fe3486 |
[occdir=$withval]
|
|
|
8fe3486 |
[occon=true],
|
|
|
8fe3486 |
- [occdir=/opt/OpenCASCADE]
|
|
|
8fe3486 |
+ [occdir=/usr]
|
|
|
8fe3486 |
)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
if test a$occon = atrue ; then
|
|
|
8fe3486 |
|
|
|
8fe3486 |
- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"])
|
|
|
8fe3486 |
- AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
|
|
|
8fe3486 |
+ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"])
|
|
|
8fe3486 |
+ AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
|
|
|
8fe3486 |
|
|
|
8fe3486 |
# -lTKDCAF
|
|
|
8fe3486 |
|
|
|
accac45 |
@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui],
|
|
|
8fe3486 |
[AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])],
|
|
|
8fe3486 |
[if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi])
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-metisdir=/usr/local
|
|
|
8fe3486 |
+metisdir=/usr
|
|
|
8fe3486 |
AC_ARG_WITH([metis],
|
|
|
8fe3486 |
[AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])],
|
|
|
8fe3486 |
[metisdir=$withval],
|
|
|
8fe3486 |
- [metisdir=/usr/local]
|
|
|
8fe3486 |
+ [metisdir=/usr]
|
|
|
8fe3486 |
)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
AC_ARG_ENABLE([parallel],
|
|
|
8fe3486 |
[AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])],
|
|
|
8fe3486 |
- [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")]
|
|
|
8fe3486 |
+ [AC_SUBST([MPI_INCLUDES], "-DMETIS")]
|
|
|
8fe3486 |
[CXXFLAGS="$CXXFLAGS -DPARALLEL"]
|
|
|
8fe3486 |
- [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")]
|
|
|
8fe3486 |
+ [AC_SUBST([MPI_LIBS], "-lmetis")]
|
|
|
8fe3486 |
)
|
|
|
8fe3486 |
# -DVTRACE
|
|
|
8fe3486 |
# -lvt-hyb
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/csg/Makefile.am 2014-10-07 21:38:21.787017193 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/csg/Makefile.am 2014-10-07 21:39:14.530034275 +0200
|
|
|
accac45 |
@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp
|
|
|
8fe3486 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libcsg.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libngcsg.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libcsg_la_SOURCES = algprim.cpp brick.cpp \
|
|
|
8fe3486 |
+libngcsg_la_SOURCES = algprim.cpp brick.cpp \
|
|
|
8fe3486 |
bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \
|
|
|
8fe3486 |
explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \
|
|
|
8fe3486 |
manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \
|
|
|
8fe3486 |
solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp
|
|
|
8fe3486 |
|
|
|
accac45 |
-libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
|
|
|
accac45 |
+libngcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
accac45 |
if NGGUI
|
|
|
accac45 |
-lib_LTLIBRARIES += libcsgvis.la
|
|
|
accac45 |
+lib_LTLIBRARIES += libngcsgvis.la
|
|
|
accac45 |
|
|
|
accac45 |
-libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
|
|
|
8fe3486 |
-libcsgvis_la_LIBADD = libcsg.la
|
|
|
accac45 |
+libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
|
|
|
accac45 |
+libngcsgvis_la_LIBADD = libngcsg.la
|
|
|
accac45 |
endif
|
|
|
8fe3486 |
|
|
|
8fe3486 |
# $(top_builddir)/libsrc/geom2d/libgeom2d.la
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/general/Makefile.am 2014-10-07 21:38:21.638014320 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/general/Makefile.am 2014-10-07 21:39:14.531034296 +0200
|
|
|
accac45 |
@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
-noinst_LTLIBRARIES = libgen.la
|
|
|
8fe3486 |
-libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \
|
|
|
8fe3486 |
+noinst_LTLIBRARIES = libnggen.la
|
|
|
8fe3486 |
+libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \
|
|
|
8fe3486 |
hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \
|
|
|
8fe3486 |
profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \
|
|
|
8fe3486 |
mpi_interface.cpp gzstream.cpp
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/geom2d/Makefile.am 2014-10-07 21:38:21.832018060 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am 2014-10-07 21:39:14.531034296 +0200
|
|
|
8fe3486 |
@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc
|
|
|
8fe3486 |
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libgeom2d.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libnggeom2d.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
if NGGUI
|
|
|
8fe3486 |
-lib_LTLIBRARIES += libgeom2dvis.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES += libnggeom2dvis.la
|
|
|
8fe3486 |
endif
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp
|
|
|
8fe3486 |
-libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
|
|
|
8fe3486 |
+libnggeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp
|
|
|
8fe3486 |
+libnggeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp
|
|
|
8fe3486 |
-libgeom2dvis_la_LIBADD = libgeom2d.la
|
|
|
8fe3486 |
+libnggeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp
|
|
|
8fe3486 |
+libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/gprim/Makefile.am 2014-10-07 21:38:21.719015882 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/gprim/Makefile.am 2014-10-07 21:39:14.531034296 +0200
|
|
|
8fe3486 |
@@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp geom3d.hpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
-noinst_LTLIBRARIES = libgprim.la
|
|
|
8fe3486 |
-libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \
|
|
|
8fe3486 |
+noinst_LTLIBRARIES = libnggprim.la
|
|
|
8fe3486 |
+libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \
|
|
|
8fe3486 |
geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/interface/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/interface/Makefile.am 2014-10-07 21:38:21.846018330 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/interface/Makefile.am 2014-10-07 21:44:17.523887314 +0200
|
|
|
accac45 |
@@ -2,14 +2,14 @@ noinst_HEADERS = writeuser.hpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libinterface.la
|
|
|
8fe3486 |
-libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libnginterface.la
|
|
|
8fe3486 |
+libnginterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \
|
|
|
8fe3486 |
read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \
|
|
|
8fe3486 |
writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \
|
|
|
8fe3486 |
writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \
|
|
|
accac45 |
wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp
|
|
|
accac45 |
|
|
|
accac45 |
|
|
|
accac45 |
-libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
|
|
|
679c1a8 |
+libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la
|
|
|
accac45 |
|
|
|
accac45 |
# libinterface_la_LDFLAGS = -rdynamic
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/linalg/Makefile.am 2014-10-07 21:38:21.667014879 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/linalg/Makefile.am 2014-10-07 21:39:14.532034315 +0200
|
|
|
8fe3486 |
@@ -1,8 +1,8 @@
|
|
|
8fe3486 |
noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp
|
|
|
8fe3486 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
-noinst_LTLIBRARIES = libla.la
|
|
|
8fe3486 |
-libla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp
|
|
|
8fe3486 |
+noinst_LTLIBRARIES = libngla.la
|
|
|
8fe3486 |
+libngla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
# vector.cpp
|
|
|
8fe3486 |
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshing/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/meshing/Makefile.am 2014-10-07 21:38:21.895019275 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/meshing/Makefile.am 2014-10-07 21:39:14.532034315 +0200
|
|
|
8fe3486 |
@@ -15,9 +15,9 @@ clusters.hpp hprefinement.hpp improve3.h
|
|
|
8fe3486 |
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libmesh.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libngmesh.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \
|
|
|
8fe3486 |
+libngmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \
|
|
|
8fe3486 |
clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp \
|
|
|
8fe3486 |
geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp \
|
|
|
8fe3486 |
improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \
|
|
|
8fe3486 |
@@ -30,8 +30,8 @@ libmesh_la_SOURCES = adfront2.cpp adfron
|
|
|
8fe3486 |
topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \
|
|
|
8fe3486 |
parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libla.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/gprim/libgprim.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/general/libgen.la \
|
|
|
8fe3486 |
- -lz
|
|
|
8fe3486 |
+libngmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libngla.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/gprim/libnggprim.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/general/libnggen.la \
|
|
|
8fe3486 |
+ $(MPI_LIBS) -lz
|
|
|
8fe3486 |
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/occ/Makefile.am 2014-10-07 21:38:21.739016267 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/occ/Makefile.am 2014-10-07 21:39:14.533034334 +0200
|
|
|
8fe3486 |
@@ -14,20 +14,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc
|
|
|
8fe3486 |
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libocc.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libngocc.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
if NGGUI
|
|
|
8fe3486 |
-lib_LTLIBRARIES += liboccvis.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES += libngoccvis.la
|
|
|
8fe3486 |
endif
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \
|
|
|
8fe3486 |
+libngocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \
|
|
|
8fe3486 |
Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \
|
|
|
8fe3486 |
occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libocc_la_LIBADD = $(OCCLIBS)
|
|
|
8fe3486 |
+libngocc_la_LIBADD = $(OCCLIBS)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-liboccvis_la_SOURCES = occpkg.cpp vsocc.cpp
|
|
|
8fe3486 |
-liboccvis_la_LIBADD = libocc.la
|
|
|
8fe3486 |
+libngoccvis_la_SOURCES = occpkg.cpp vsocc.cpp
|
|
|
8fe3486 |
+libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlgeom/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2014-10-07 21:38:21.683015188 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/stlgeom/Makefile.am 2014-10-07 21:39:14.533034334 +0200
|
|
|
8fe3486 |
@@ -4,18 +4,18 @@ stltool.hpp stltopology.hpp vsstl.hpp
|
|
|
8fe3486 |
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-lib_LTLIBRARIES = libstl.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES = libngstl.la
|
|
|
8fe3486 |
|
|
|
8fe3486 |
if NGGUI
|
|
|
8fe3486 |
-lib_LTLIBRARIES += libstlvis.la
|
|
|
8fe3486 |
+lib_LTLIBRARIES += libngstlvis.la
|
|
|
8fe3486 |
endif
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
|
|
|
8fe3486 |
+libngstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
|
|
|
8fe3486 |
stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp
|
|
|
8fe3486 |
-libstlvis_la_LIBADD = libstl.la
|
|
|
8fe3486 |
-libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
|
|
|
8fe3486 |
+libngstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp
|
|
|
8fe3486 |
+libngstlvis_la_LIBADD = libngstl.la -lGL $(MPI_LIBS) $(TCL_LIB_SPEC)
|
|
|
8fe3486 |
+libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS)
|
|
|
8fe3486 |
# libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la
|
|
|
8fe3486 |
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc/visualization/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/libsrc/visualization/Makefile.am 2014-10-07 21:38:21.822017867 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/libsrc/visualization/Makefile.am 2014-10-07 21:39:14.533034334 +0200
|
|
|
8fe3486 |
@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_s
|
|
|
8fe3486 |
METASOURCES = AUTO
|
|
|
8fe3486 |
|
|
|
8fe3486 |
if NGGUI
|
|
|
8fe3486 |
-noinst_LTLIBRARIES = libvisual.la
|
|
|
8fe3486 |
+noinst_LTLIBRARIES = libngvisual.la
|
|
|
8fe3486 |
endif
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \
|
|
|
8fe3486 |
+libngvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \
|
|
|
8fe3486 |
vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-
|
|
|
8fe3486 |
+libngvisual_la_LIBADD = -lGL
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/ng/Makefile.am 2014-10-07 21:38:21.973020778 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/ng/Makefile.am 2014-10-07 21:39:14.534034353 +0200
|
|
|
accac45 |
@@ -17,21 +17,18 @@ MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lm
|
|
|
8fe3486 |
endif
|
|
|
accac45 |
# -lpardiso500-GNU472-X86-64 -lgfortran
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/csg/libcsgvis.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/csg/libcsg.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/interface/libinterface.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/meshing/libmesh.la \
|
|
|
accac45 |
- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
|
|
|
accac45 |
-
|
|
|
8fe3486 |
-
|
|
|
8fe3486 |
-#
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/occ/liboccvis.la
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/occ/libocc.la
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/stlgeom/libstlvis.la
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/stlgeom/libstl.la
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/geom2d/libgeom2d.la
|
|
|
8fe3486 |
-# $(top_builddir)/libsrc/geom2d/libgeom2dvis.la
|
|
|
8fe3486 |
+netgen_LDADD = $(top_builddir)/libsrc/visualization/libngvisual.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/csg/libngcsgvis.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/csg/libngcsg.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/interface/libnginterface.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/meshing/libngmesh.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/occ/libngoccvis.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/occ/libngocc.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/stlgeom/libngstlvis.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/stlgeom/libngstl.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/geom2d/libnggeom2dvis.la \
|
|
|
8fe3486 |
+ -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 -ldl -lX11 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
8fe3486 |
# add for static linkage of ngsolve:
|
|
|
679c1a8 |
diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am
|
|
|
679c1a8 |
--- netgen-5.3.1/nglib/Makefile.am 2014-10-07 21:38:21.552012662 +0200
|
|
|
679c1a8 |
+++ netgen-5.3.1-new/nglib/Makefile.am 2014-10-07 21:39:27.915292493 +0200
|
|
|
8fe3486 |
@@ -8,15 +8,15 @@ lib_LTLIBRARIES = libnglib.la
|
|
|
8fe3486 |
libnglib_la_SOURCES = nglib.cpp
|
|
|
8fe3486 |
|
|
|
8fe3486 |
libnglib_la_LIBADD = \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/interface/libinterface.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/geom2d/libgeom2d.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/csg/libcsg.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/stlgeom/libstl.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/occ/libocc.la \
|
|
|
8fe3486 |
- $(top_builddir)/libsrc/meshing/libmesh.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/interface/libnginterface.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/csg/libngcsg.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/stlgeom/libngstl.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/occ/libngocc.la \
|
|
|
8fe3486 |
+ $(top_builddir)/libsrc/meshing/libngmesh.la \
|
|
|
8fe3486 |
$(OCCLIBS) $(MPI_LIBS)
|
|
|
8fe3486 |
|
|
|
8fe3486 |
-libnglib_la_LDFLAGS = -avoid-version
|
|
|
679c1a8 |
+libnglib_la_LDFLAGS = -release $(PACKAGE_VERSION)
|
|
|
8fe3486 |
# -rdynamic
|
|
|
8fe3486 |
|
|
|
8fe3486 |
|
|
|
accac45 |
@@ -25,24 +25,24 @@ bin_PROGRAMS = ng_vol ng_stl
|
|
|
accac45 |
|
|
|
accac45 |
ng_vol_SOURCES = ng_vol.cpp
|
|
|
accac45 |
ng_vol_LDADD = libnglib.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/interface/libinterface.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/geom2d/libgeom2d.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/csg/libcsg.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/stlgeom/libstl.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/occ/libocc.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/meshing/libmesh.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/interface/libnginterface.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/csg/libngcsg.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/stlgeom/libngstl.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/occ/libngocc.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/meshing/libngmesh.la \
|
|
|
accac45 |
$(OCCLIBS) $(MPI_LIBS)
|
|
|
accac45 |
|
|
|
accac45 |
|
|
|
accac45 |
|
|
|
accac45 |
ng_stl_SOURCES = ng_stl.cpp
|
|
|
accac45 |
ng_stl_LDADD = libnglib.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/interface/libinterface.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/geom2d/libgeom2d.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/csg/libcsg.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/stlgeom/libstl.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/occ/libocc.la \
|
|
|
accac45 |
- $(top_builddir)/libsrc/meshing/libmesh.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/interface/libnginterface.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/csg/libngcsg.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/stlgeom/libngstl.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/occ/libngocc.la \
|
|
|
accac45 |
+ $(top_builddir)/libsrc/meshing/libngmesh.la \
|
|
|
accac45 |
$(OCCLIBS) $(MPI_LIBS)
|
|
|
accac45 |
|
|
|
accac45 |
# ng_occ_SOURCES = ng_occ.cpp
|