diff --git a/ng/Makefile.am b/ng/Makefile.am index 9ec916b7..5ea7f644 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -10,9 +10,6 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ $(top_builddir)/libsrc/csg/libcsgvis.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ - $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/linalg/libla.la \ - $(top_builddir)/libsrc/general/libgen.la \ -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) # # $(top_builddir)/libsrc/occ/liboccvis.la @@ -21,6 +18,9 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ # $(top_builddir)/libsrc/stlgeom/libstl.la # $(top_builddir)/libsrc/geom2d/libgeom2d.la # $(top_builddir)/libsrc/geom2d/libgeom2dvis.la +# $(top_builddir)/libsrc/gprim/libgprim.la \ +# $(top_builddir)/libsrc/linalg/libla.la \ +# $(top_builddir)/libsrc/general/libgen.la # add for static linkage of ngsolve: diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp index 853874ee..8b3d0d7c 100644 --- a/ng/ngpkg.cpp +++ b/ng/ngpkg.cpp @@ -3063,17 +3063,10 @@ void PlayAnimFile(const char* name, int speed, int maxcnt) #ifdef _MSC_VER extern "C" int Ng_stl_Init (Tcl_Interp * interp); extern "C" int Ng_geom2d_Init (Tcl_Interp * interp); -#endif - #ifdef OCCGEOMETRY - // extern "C" int Ng_occ_Init (Tcl_Interp * interp); + extern "C" int Ng_occ_Init (Tcl_Interp * interp); +#endif #endif - - // extern "C" int Ng_Geom2d_Init (Tcl_Interp * interp); - - // int main_Eero (ClientData clientData, - // Tcl_Interp * interp, - // int argc, tcl_const char *argv[]); int Ng_Init (Tcl_Interp * interp) @@ -3087,6 +3080,9 @@ void PlayAnimFile(const char* name, int speed, int maxcnt) #ifdef _MSC_VER Ng_stl_Init(interp); Ng_geom2d_Init (interp); +#ifdef OCCGEOMETRY + Ng_occ_Init (interp); +#endif #endif