ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

libadds

Browse Source
This commit is contained in:
Joachim Schoeberl 2014-08-13 16:15:19 +00:00
parent 66168dcd9e
commit 4175aff8b5
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsrc/interface/Makefile.am
View File

@ -10,3 +10,6 @@ libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \
wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp
libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
# libinterface_la_LDFLAGS = -rdynamic

9
ng/Makefile.am
View File

@ -1,6 +1,6 @@
include_HEADERS =
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES)
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) -I/usr/include/python3.4
if NGGUI
bin_PROGRAMS = netgen
@ -21,7 +21,8 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \
$(top_builddir)/libsrc/csg/libcsg.la \
$(top_builddir)/libsrc/interface/libinterface.la \
$(top_builddir)/libsrc/meshing/libmesh.la \
-L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
-L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
#
# $(top_builddir)/libsrc/occ/liboccvis.la
@ -43,8 +44,10 @@ ngtesting.tcl parameters.tcl variables.tcl csgeom.tcl stlgeom.tcl \
occgeom.tcl acisgeom.tcl netgen.ocf
netgen_LDFLAGS = -export-dynamic
netgen_LDFLAGS = -export-dynamic -lboost_python-py34 -lpython3.4m
# netgen_LDFLAGS = -rdynamic
# -static
# netgen_LDFLAGS += -rdynamic

1
ng/ngappinit.cpp
View File

@ -7,6 +7,7 @@
#include "incvis.hpp"
#include <meshing.hpp>
#include <boost/python.hpp>
namespace netgen

16
nglib/Makefile.am
View File

@ -7,14 +7,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(MPI_INCLUDES) $(OCCFLAGS)
lib_LTLIBRARIES = libnglib.la
libnglib_la_SOURCES = nglib.cpp
# libnglib_la_LIBADD = \
# $(top_builddir)/libsrc/interface/libinterface.la \
# $(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 \
# $(OCCLIBS) $(MPI_LIBS)
libnglib_la_LIBADD = \
$(top_builddir)/libsrc/interface/libinterface.la \
$(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 \
$(OCCLIBS) $(MPI_LIBS)
libnglib_la_LDFLAGS = -avoid-version
# -rdynamic