occ and nglib fixes

Makefile.am

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

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([netgen],[4.9.5],[],[])
+AC_INIT([netgen],[4.9.6],[],[])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 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/stlgeom/Makefile
   libsrc/visualization/Makefile ng/Makefile nglib/Makefile
-  tutorials/Makefile doc/Makefile)
+  tutorials/Makefile doc/Makefile windows/Makefile )
 
 AC_OUTPUT

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.5"
+#define PACKAGE_VERSION "4.9.6"
 #endif
 
 

nglib/Makefile.am

@@ -10,10 +10,12 @@ libnglib_la_LIBADD = \
 	$(top_builddir)/libsrc/geom2d/libgeom2d.la \
 	$(top_builddir)/libsrc/csg/libcsg.la \
 	$(top_builddir)/libsrc/stlgeom/libstl.la \
+	$(top_builddir)/libsrc/occ/libocc.la \
 	$(top_builddir)/libsrc/meshing/libmesh.la \
 	$(top_builddir)/libsrc/gprim/libgprim.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
 #  -rdynamic

nglib/nglib.cpp

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

windows/Makefile.am

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