ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

load Tix as Tcl-package, rather than linking it

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-01-13 12:51:35 +00:00
parent 4f3f7d23b4
commit c6ee5b77c6
6 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -34,9 +34,9 @@ host_triplet = @host@
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
INSTALL NEWS TODO config.guess config.sub depcomp install-sh \ TODO config.guess config.sub depcomp install-sh ltmain.sh \
ltmain.sh missing mkinstalldirs missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

2
configure vendored
View File

@ -2367,7 +2367,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=netgen PACKAGE=netgen
VERSION=5.0 VERSION=4.9.2
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.in
View File

@ -1,7 +1,7 @@
AC_INIT(configure.in) AC_INIT(configure.in)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(netgen, 5.0) AM_INIT_AUTOMAKE(netgen, 4.9.2)
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_PROG_CXX AC_PROG_CXX

13
ng/Makefile.am
View File

@ -2,13 +2,12 @@ INCLUDES = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface
METASOURCES = AUTO METASOURCES = AUTO
bin_PROGRAMS = netgen bin_PROGRAMS = netgen
netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp
netgen_LDADD = $(top_builddir)/libsrc/occ/libocc.a \ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/csg/libcsg.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ $(top_builddir)/libsrc/general/libgeneral.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/interface/libinterface.a \
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/occ/libocc.a $(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \ $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/interface/libinterface.a $(top_builddir)/libsrc/meshing/libmesh.a \ -L/usr/local/lib/Togl1.7 -lGLU -lTKBRep -lTKIGES -lTKSTEP -lTKSTL -lTogl1.7 -ltcl8.5 -ltk8.5
$(top_builddir)/libsrc/opti/libopti.a $(top_builddir)/libsrc/linalg/libla.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/general/libgeneral.a -lTKSTL -lTKSTEP -lTKBRep \
-lTKIGES -L/usr/lib/tcl/Tix8.4.3 -L/usr/local/lib/Togl1.7 -lGLU -lTix8.4.3 \
-lTogl1.7 -ltcl8.5 -ltk8.5
AM_CXXFLAGS = -DOPENGL AM_CXXFLAGS = -DOPENGL

31
ng/Makefile.in
View File

@ -48,17 +48,17 @@ PROGRAMS = $(bin_PROGRAMS)
am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \ am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \
ngpkg.$(OBJEXT) onetcl.$(OBJEXT) ngpkg.$(OBJEXT) onetcl.$(OBJEXT)
netgen_OBJECTS = $(am_netgen_OBJECTS) netgen_OBJECTS = $(am_netgen_OBJECTS)
netgen_DEPENDENCIES = $(top_builddir)/libsrc/occ/libocc.a \ netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/csg/libcsg.a \ $(top_builddir)/libsrc/general/libgeneral.a \
$(top_builddir)/libsrc/geom2d/libgeom2d.a \ $(top_builddir)/libsrc/geom2d/libgeom2d.a \
$(top_builddir)/libsrc/stlgeom/libstl.a \
$(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/interface/libinterface.a \
$(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/linalg/libla.a \
$(top_builddir)/libsrc/gprim/libgprim.a \ $(top_builddir)/libsrc/gprim/libgprim.a \
$(top_builddir)/libsrc/general/libgeneral.a $(top_builddir)/libsrc/interface/libinterface.a \
$(top_builddir)/libsrc/linalg/libla.a \
$(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/occ/libocc.a \
$(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/stlgeom/libstl.a \
$(top_builddir)/libsrc/visualization/libvisual.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -194,14 +194,13 @@ top_srcdir = @top_srcdir@
INCLUDES = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface INCLUDES = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface
METASOURCES = AUTO METASOURCES = AUTO
netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp
netgen_LDADD = $(top_builddir)/libsrc/occ/libocc.a \ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/csg/libcsg.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ $(top_builddir)/libsrc/general/libgeneral.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/interface/libinterface.a \
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/occ/libocc.a $(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \ $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/interface/libinterface.a $(top_builddir)/libsrc/meshing/libmesh.a \ -L/usr/local/lib/Togl1.7 -lGLU -lTKBRep -lTKIGES -lTKSTEP -lTKSTL -lTogl1.7 -ltcl8.5 -ltk8.5
$(top_builddir)/libsrc/opti/libopti.a $(top_builddir)/libsrc/linalg/libla.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/general/libgeneral.a -lTKSTL -lTKSTEP -lTKBRep \
-lTKIGES -L/usr/lib/tcl/Tix8.4.3 -L/usr/local/lib/Togl1.7 -lGLU -lTix8.4.3 \
-lTogl1.7 -ltcl8.5 -ltk8.5
AM_CXXFLAGS = -DOPENGL AM_CXXFLAGS = -DOPENGL
all: all-am all: all-am

3
ng/onetcl.cpp
View File

@ -1,6 +1,9 @@
const char * ngscript[] = { const char * ngscript[] = {
"\n",\ "\n",\
"\n",\ "\n",\
"if {[catch {package require Tix }]} {\n",\
" puts \"cannot find package Tix\"\n",\
"}\n",\
"set userlevel 3\n",\ "set userlevel 3\n",\
"if { [Ng_GetCommandLineParameter expert]==\"defined\" } {\n",\ "if { [Ng_GetCommandLineParameter expert]==\"defined\" } {\n",\
" set userlevel 3\n",\ " set userlevel 3\n",\