ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-31 07:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

occ-init for windows (otherwise occ is shared library)

Browse Source
This commit is contained in:
Joachim Schoeberl 2012-06-12 09:57:05 +00:00
parent 923aec0182
commit a723b6bb08
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ng/Makefile.am
View File

@ -10,9 +10,6 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/csg/libcsgvis.la \ $(top_builddir)/libsrc/csg/libcsgvis.la \
$(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/interface/libinterface.la \
$(top_builddir)/libsrc/meshing/libmesh.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) -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 # $(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/stlgeom/libstl.la
# $(top_builddir)/libsrc/geom2d/libgeom2d.la # $(top_builddir)/libsrc/geom2d/libgeom2d.la
# $(top_builddir)/libsrc/geom2d/libgeom2dvis.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: # add for static linkage of ngsolve:

14
ng/ngpkg.cpp
View File

@ -3063,17 +3063,10 @@ void PlayAnimFile(const char* name, int speed, int maxcnt)
#ifdef _MSC_VER #ifdef _MSC_VER
extern "C" int Ng_stl_Init (Tcl_Interp * interp); extern "C" int Ng_stl_Init (Tcl_Interp * interp);
extern "C" int Ng_geom2d_Init (Tcl_Interp * interp); extern "C" int Ng_geom2d_Init (Tcl_Interp * interp);
#endif
#ifdef OCCGEOMETRY #ifdef OCCGEOMETRY
// extern "C" int Ng_occ_Init (Tcl_Interp * interp); extern "C" int Ng_occ_Init (Tcl_Interp * interp);
#endif
#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) int Ng_Init (Tcl_Interp * interp)
@ -3087,6 +3080,9 @@ void PlayAnimFile(const char* name, int speed, int maxcnt)
#ifdef _MSC_VER #ifdef _MSC_VER
Ng_stl_Init(interp); Ng_stl_Init(interp);
Ng_geom2d_Init (interp); Ng_geom2d_Init (interp);
#ifdef OCCGEOMETRY
Ng_occ_Init (interp);
#endif
#endif #endif