summaryrefslogtreecommitdiff
path: root/cad/netgen/files/patch-ng_Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'cad/netgen/files/patch-ng_Makefile.am')
-rw-r--r--cad/netgen/files/patch-ng_Makefile.am22
1 files changed, 11 insertions, 11 deletions
diff --git a/cad/netgen/files/patch-ng_Makefile.am b/cad/netgen/files/patch-ng_Makefile.am
index 2050bc4835af..3a057bf40748 100644
--- a/cad/netgen/files/patch-ng_Makefile.am
+++ b/cad/netgen/files/patch-ng_Makefile.am
@@ -1,11 +1,11 @@
---- ng/Makefile.am.orig 2010-05-20 19:08:54.000000000 +0700
-+++ ng/Makefile.am 2010-05-27 16:46:45.000000000 +0700
-@@ -16,7 +16,7 @@
- $(top_builddir)/libsrc/gprim/libgprim.la \
- $(top_builddir)/libsrc/linalg/libla.la \
- $(top_builddir)/libsrc/general/libgen.la \
-- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS)
-+ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS)
-
- # add for static linkage of ngsolve:
- # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -L/opt/intel/mkl/10.2.1.017/lib/em64t /opt/intel/mkl/10.2.1.017/lib/em64t/libmkl_solver_lp64.a -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core
+--- ng/Makefile.am-orig 2012-11-22 00:29:00.000000000 +0000
++++ ng/Makefile.am 2012-11-22 00:29:28.000000000 +0000
+@@ -14,7 +14,7 @@
+ $(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)
++ -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(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/libocc.la