ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 21:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

occ and nglib fixes

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-01-31 21:07:21 +00:00
parent 8212006b9c
commit 4a9be1de47
6 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
METASOURCES = AUTO METASOURCES = AUTO
SUBDIRS = libsrc ng nglib tutorials doc SUBDIRS = libsrc ng nglib tutorials doc windows
# TESTS = ng/netgen -batchmode # TESTS = ng/netgen -batchmode

4
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([netgen],[4.9.5],[],[]) AC_INIT([netgen],[4.9.6],[],[])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -104,6 +104,6 @@ libsrc/include/Makefile libsrc/interface/Makefile
libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile
libsrc/stlgeom/Makefile libsrc/stlgeom/Makefile
libsrc/visualization/Makefile ng/Makefile nglib/Makefile libsrc/visualization/Makefile ng/Makefile nglib/Makefile
tutorials/Makefile doc/Makefile) tutorials/Makefile doc/Makefile windows/Makefile )
AC_OUTPUT AC_OUTPUT

2
libsrc/include/mydefs.hpp
View File

@ -20,7 +20,7 @@
// in the configure/make phases, with the // in the configure/make phases, with the
// right version number // right version number
#ifdef WIN32 #ifdef WIN32
#define PACKAGE_VERSION "4.9.5" #define PACKAGE_VERSION "4.9.6"
#endif #endif

4
nglib/Makefile.am
View File

@ -10,10 +10,12 @@ libnglib_la_LIBADD = \
$(top_builddir)/libsrc/geom2d/libgeom2d.la \ $(top_builddir)/libsrc/geom2d/libgeom2d.la \
$(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/csg/libcsg.la \
$(top_builddir)/libsrc/stlgeom/libstl.la \ $(top_builddir)/libsrc/stlgeom/libstl.la \
$(top_builddir)/libsrc/occ/libocc.la \
$(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/meshing/libmesh.la \
$(top_builddir)/libsrc/gprim/libgprim.la \ $(top_builddir)/libsrc/gprim/libgprim.la \
$(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/linalg/libla.la \
$(top_builddir)/libsrc/general/libgeneral.la $(MPI_LIBS) $(top_builddir)/libsrc/general/libgeneral.la \
$(OCCLIBS) $(MPI_LIBS)
libnglib_la_LDFLAGS = -avoid-version libnglib_la_LDFLAGS = -avoid-version
# -rdynamic # -rdynamic

7
nglib/nglib.cpp
View File

@ -42,6 +42,13 @@ namespace netgen
#endif #endif
// should not be needed (occ currently requires it)
namespace netgen {
#include "../libsrc/visualization/vispar.hpp"
VisualizationParameters vispar;
VisualizationParameters :: VisualizationParameters() { ; }
}
namespace nglib { namespace nglib {
#include "nglib.h" #include "nglib.h"

4
windows/Makefile.am Normal file
View File

@ -0,0 +1,4 @@
dist_noinst_DATA = netgen.sln netgen.suo netgen.vcproj postBuild_Install.bat
# abc