19 lines
989 B
Text
19 lines
989 B
Text
--- ng/Makefile.am.orig 2014-08-29 09:54:01 UTC
|
|
+++ ng/Makefile.am
|
|
@@ -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) $(TK_INCLUDES)
|
|
|
|
|
|
if NGGUI
|
|
@@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi
|
|
$(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)
|
|
+ -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
|
|
|
|
|
|
#
|