diff --git a/libsrc/general/Makefile.am b/libsrc/general/Makefile.am index 00017423..5f6ac07a 100644 --- a/libsrc/general/Makefile.am +++ b/libsrc/general/Makefile.am @@ -1,12 +1,11 @@ -noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp dynamicmem.hpp parthreads.hpp mpi_interface.hpp gzstream.h archive_base.hpp ngpython.hpp - -include_HEADERS = ngexception.hpp - -AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -METASOURCES = AUTO -noinst_LTLIBRARIES = libgen.la -libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ - hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ - profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ - mpi_interface.cpp gzstream.cpp - +noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp dynamicmem.hpp parthreads.hpp mpi_interface.hpp gzstream.h archive_base.hpp ngpython.hpp + +include_HEADERS = ngexception.hpp + +AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include +METASOURCES = AUTO +noinst_LTLIBRARIES = libgen.la +libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ + hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ + profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ + mpi_interface.cpp gzstream.cpp diff --git a/ng/Makefile.am b/ng/Makefile.am index ecba0a6c..c45343d5 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -9,7 +9,7 @@ if NGGUI bin_PROGRAMS = netgen endif -netgen_SOURCES = demoview.cpp ngappinit.cpp netgenpy.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h +netgen_SOURCES = demoview.cpp ngappinit.cpp netgenpy.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h main.cpp netgenpy.cpp # nginterface.cpp nginterface_v2.cpp diff --git a/ng/main.cpp b/ng/main.cpp index c83584bf..8338273d 100644 --- a/ng/main.cpp +++ b/ng/main.cpp @@ -1,3 +1,8 @@ +#ifdef WIN32 + +// a wrapper to load netgen-dll into the executable + + #include DLL_HEADER int NG_main(int argc, char ** argv); @@ -5,4 +10,8 @@ DLL_HEADER int NG_main(int argc, char ** argv); int main(int argc, char ** argv) { return NG_main(argc, argv); -} \ No newline at end of file +} + + +#endif + diff --git a/ng/netgenpy.cpp b/ng/netgenpy.cpp index 8f396260..d627af57 100644 --- a/ng/netgenpy.cpp +++ b/ng/netgenpy.cpp @@ -1,5 +1,8 @@ #ifdef WIN32 +// a wrapper to load netgen-dll into python + + #include #include