diff options
| -rw-r--r-- | Makefile.in | 19 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | tkzinc.m4 | 4 |
4 files changed, 9 insertions, 33 deletions
diff --git a/Makefile.in b/Makefile.in index 761fcf7..3b6944d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,8 +37,6 @@ Tkzinc_SOURCES = Tabular.c Rectangle.c Arc.c Curve.c Item.c \ perfos.c Transfo.c Group.c Icon.c Text.c \ Image.c Color.c Field.c Triangles.c Window.c \ tkZinc.c @EXTRA_SOURCES@ $(Atc_SOURCES) -Tess_SOURCES = dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \ - render.c sweep.c tess.c tessmono.c WIN_SOURCES = WinPort.c UNIX_SOURCES = @@ -55,9 +53,7 @@ UNIX_SOURCES = #======================================================================== Tkzinc_OBJECTS = $(Tkzinc_SOURCES:.c=.@OBJEXT@) -Tess_OBJECTS = $(Tess_SOURCES:.c=.@OBJEXT@) Tkzinc_LIB_FILE = @Tkzinc_LIB_FILE@ -Tess_LIB_FILE = @Tess_LIB_FILE@ #======================================================================== # RUNTIME_SOURCES identifies Tcl runtime files that are associated with @@ -79,7 +75,7 @@ GENERIC_HDRS = lib_BINARIES = $($(PACKAGE)_LIB_FILE) aux_BINARIES = @aux_BINARIES@ bin_BINARIES = @bin_BINARIES@ -BINARIES = $(Tess_LIB_FILE) $(lib_BINARIES) +BINARIES = $(lib_BINARIES) SHELL = @SHELL@ @@ -102,7 +98,6 @@ pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . -tess_dir = $(srcdir)/libtess generic_dir = $(srcdir)/generic unix_dir = $(srcdir)/unix windows_dir = $(srcdir)/win @@ -169,8 +164,7 @@ SHARED_BUILD = @SHARED_BUILD@ # The local includes must come first, because the TK_XINCLUDES can be # just a comment -INCLUDES = -I$(srcdir)/generic \ - @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ @GL_INCLUDES@ -I$(tess_dir) +INCLUDES = -I$(srcdir)/generic @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ @GL_INCLUDES@ EXTRA_CFLAGS = $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@ @@ -331,11 +325,6 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJECTS) ${MAKE_LIB} #$(RANLIB) $($(PACKAGE)_LIB_FILE) -$(Tess_LIB_FILE): $(Tess_OBJECTS) - -rm -f $(Tess_LIB_FILE) - ${STLIB_LD} $@ $(Tess_OBJECTS) - $(RANLIB) $(Tess_LIB_FILE) - #======================================================================== # We need to enumerate the list of .c to .o lines here. # @@ -351,7 +340,7 @@ $(Tess_LIB_FILE): $(Tess_OBJECTS) # As necessary, add $(srcdir):$(srcdir)/compat:.... #======================================================================== -VPATH = $(srcdir):$(srcdir)/libtess:$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win +VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win .SUFFIXES: .c .$(OBJEXT) @@ -402,7 +391,7 @@ dist: dist-clean chmod 664 $(DIST_DIR)/tclconfig/tcl.m4 chmod +x $(DIST_DIR)/tclconfig/install-sh - -list='demos doc generic libtess debian redhat library mac tests unix win Perl Python'; \ + -list='demos doc generic debian redhat library mac tests unix win Perl Python'; \ for p in $$list; do \ if test -d $(srcdir)/$$p ; then \ tar cf - --exclude=CVS --exclude=.cvsignore $$p | \ @@ -66,9 +66,9 @@ AC_DEFUN(ZINC_ENABLE_GL, [ AC_MSG_RESULT([no]) else if test "${TEA_PLATFORM}" = "windows" ; then - GL_LIBS=-lopengl32 + GL_LIBS=-lglu32 -lopengl32 else - GL_LIBS="-lGL" + GL_LIBS="-lGLU -lGL" GL_INCLUDES='-I/usr/include' fi diff --git a/configure.in b/configure.in index 91236cf..6a6036e 100644 --- a/configure.in +++ b/configure.in @@ -54,7 +54,6 @@ AC_SUBST(MAJOR_VERSION) AC_SUBST(MINOR_VERSION) AC_SUBST(PATCHLEVEL) AC_SUBST(VERSION) -AC_SUBST(WIN_VERSION) AC_SUBST(PACKAGE) AC_SUBST(Tkzinc_LIB_FILE) AC_SUBST(Tkzincstub_LIB_FILE) @@ -165,18 +164,6 @@ TEA_ENABLE_SYMBOLS TEA_PATH_X #-------------------------------------------------------------------- -# This sets the tesselation library name and adjust LIBS to -# include this library. -#-------------------------------------------------------------------- -if test "${TEA_PLATFORM}" = "windows" ; then - Tess_LIB_FILE=tess.lib -else - Tess_LIB_FILE=libtess.a -fi -LIBS="${LIBS} -L. -ltess" -AC_SUBST(Tess_LIB_FILE) - -#-------------------------------------------------------------------- # Tkzinc is always linked against the tcl and tk stubs libraries #-------------------------------------------------------------------- AC_DEFINE(USE_TCL_STUBS) @@ -233,4 +220,4 @@ ZINC_ENABLE_ATC AC_SUBST(aux_BINARIES) AC_SUBST(bin_BINARIES) -AC_OUTPUT([Makefile starkit.tcl Perl/Makefile.PL Perl/Zinc.pm Python/Zinc.py win/makefile.vc win/Tkzinc.aip win/Tkzincperl.aip]) +AC_OUTPUT([Makefile starkit.tcl Perl/Makefile.PL Perl/Zinc.pm Python/Zinc.py]) @@ -53,9 +53,9 @@ AC_DEFUN(ZINC_ENABLE_GL, [ AC_MSG_RESULT([no]) else if test "${TEA_PLATFORM}" = "windows" ; then - GL_LIBS=-lopengl32 + GL_LIBS=-lglu32 -lopengl32 else - GL_LIBS="-lGL" + GL_LIBS="-lGLU -lGL" GL_INCLUDES='-I/usr/include' fi |