New version updated and usable.

1 files changed, 68 insertions, 85 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 2d21adc..b1be23b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -17,7 +17,7 @@
 #
 # $Revision$
 #
-srcdir = .
+srcdir = ..
 
 SHELL = /bin/sh
 
@@ -43,19 +43,19 @@ incdir = $(prefix)\include
 mandir = $(prefix)\man\man3
 
 windir = $(srcdir)\win
-genericdir = $(srcdir)
-tktmpdir = $(srcdir)\tkwin
-ptktmpdir = $(srcdir)\ptkwin
+genericdir = $(srcdir)\generic
+tessdir = $(srcdir)\libtess
+tmpdir = $(srcdir)
 
-tcl_inc_dir = $(prefix)\tcl8.4.1
-tk_inc_dir = $(prefix)\tk8.4.1
-INCLUDES    = /I$(srcdir) $(include32)
+tcl_inc_dir = $(prefix)\tcl8.4.2
+tk_inc_dir = $(prefix)\tk8.4.2
+INCLUDES    = /I$(srcdir)/generic /I$(srcdir)/libtess $(include32)
 
 TCL_TK_VER = 84
 # Assume that WISH is already INSTALLED
 TCLSH		= $(bindir)\tclsh$(TCL_TK_VER)
 WISH		= $(bindir)\wish$(TCL_TK_VER)
-WIN_LIBS	= glu32.lib user32.lib gdi32.lib ws2_32.lib
+WIN_LIBS	= user32.lib gdi32.lib ws2_32.lib
 #GL_LIBS	=
 GL_LIBS		= opengl32.lib
 PTKROOT		= c:\perl\site\lib
@@ -64,8 +64,10 @@ TKLIBS		= $(libdir)\tcl$(TCL_TK_VER).lib \
 		  $(GL_LIBS) $(WIN_LIBS)
 PTKLIBS		= $(PTKROOT)\auto\Tk\Tk.lib $(GL_LIBS) $(WIN_LIBS)
 
-ZINC_VER = 3
-ZINC_MAJOR = 2
+MAJOR=3
+MINOR=2
+PATCHLVL = 91
+VERSION = \"$(MAJOR).$(MINOR).$(PATCHLVL)\"
 
 #
 # Recognized compilation time flags are :
@@ -85,94 +87,75 @@ DFLAGS= /DOM /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG
 #CDEBUG = -O2 -Gs
 # Debug
 CDEBUG = -Z7 -Od
-CFLAGS = /c /W3 /nologo /YX $(CDEBUG) /DWIN /DDLL_BUILD /DBUILD_Tkzinc $(DFLAGS)
-TKCPPFLAGS = /Fp$(tktmpdir)\ $(INCLUDES) /I"$(incdir)" /I$(tk_inc_dir)\generic /I$(tk_inc_dir)\win /I$(tcl_inc_dir)\generic /I$(tcl_inc_dir)\win
-PTKCPPFLAGS = /DPTK /Fp$(ptktmpdir)\ $(INCLUDES) /I$(PTKROOT)\Tk\pTk /I$(PTKROOT)\Tk
+CFLAGS = /c /W3 /nologo /YX $(CDEBUG) /D__STDC__ /DVERSION=$(VERSION) /DDLL_BUILD /DBUILD_Tkzinc $(DFLAGS)
+TKCPPFLAGS = /Fp$(tmpdir)\ $(INCLUDES) /I"$(incdir)" /I$(tk_inc_dir)\generic /I$(tk_inc_dir)\win /I$(tcl_inc_dir)\generic /I$(tcl_inc_dir)\win
+PTKCPPFLAGS = /DPTK /Fp$(tmpdir)\ $(INCLUDES) /I$(PTKROOT)\Tk\pTk /I$(PTKROOT)\Tk
+
+LFLAGS	= /nologo /machine:IX86 /warn:3 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib
 
-LFLAGS	= /nologo /machine:IX86 /warn:3 $(libpath32)
 DLLENTRY = @12
 DLLLFLAGS = $(LFLAGS) /entry:_DllMainCRTStartup$(DLLENTRY) /dll
 
-TKDLLOBJS = $(tktmpdir)\Track.obj \
-	$(tktmpdir)\Tabular.obj \
-	$(tktmpdir)\Reticle.obj \
-	$(tktmpdir)\Map.obj \
-	$(tktmpdir)\Rectangle.obj \
-	$(tktmpdir)\Arc.obj \
-	$(tktmpdir)\Curve.obj \
-	$(tktmpdir)\Item.obj \
-#	$(tktmpdir)\PostScript.obj \
-	$(tktmpdir)\MapInfo.obj \
-	$(tktmpdir)\Attrs.obj \
-	$(tktmpdir)\Draw.obj \
-	$(tktmpdir)\Geo.obj \
-	$(tktmpdir)\List.obj \
-#	$(tktmpdir)\perfos.obj \
-	$(tktmpdir)\version.obj \
-	$(tktmpdir)\Transfo.obj \
-	$(tktmpdir)\Group.obj \
-	$(tktmpdir)\Icon.obj \
-	$(tktmpdir)\Text.obj \
-	$(tktmpdir)\Color.obj \
-	$(tktmpdir)\Field.obj \
-	$(tktmpdir)\Triangles.obj \
-	$(tktmpdir)\Window.obj \
-	$(tktmpdir)\tkZinc.obj \
-	$(tktmpdir)\OverlapMan.obj \
-	$(tktmpdir)\WinPort.obj \
-	$(tktmpdir)\Image.obj
-
-PTKDLLOBJS = $(ptktmpdir)\Track.obj \
-	$(ptktmpdir)\Tabular.obj \
-	$(ptktmpdir)\Reticle.obj \
-	$(ptktmpdir)\Map.obj \
-	$(ptktmpdir)\Rectangle.obj \
-	$(ptktmpdir)\Arc.obj \
-	$(ptktmpdir)\Curve.obj \
-	$(ptktmpdir)\Item.obj \
-#	$(ptktmpdir)\PostScript.obj \
-	$(ptktmpdir)\MapInfo.obj \
-	$(ptktmpdir)\Attrs.obj \
-	$(ptktmpdir)\Draw.obj \
-	$(ptktmpdir)\Geo.obj \
-	$(ptktmpdir)\List.obj \
-#	$(ptktmpdir)\perfos.obj \
-	$(ptktmpdir)\version.obj \
-	$(ptktmpdir)\Transfo.obj \
-	$(ptktmpdir)\Group.obj \
-	$(ptktmpdir)\Icon.obj \
-	$(ptktmpdir)\Text.obj \
-	$(ptktmpdir)\Color.obj \
-	$(ptktmpdir)\Field.obj \
-	$(ptktmpdir)\Triangles.obj \
-	$(ptktmpdir)\Window.obj \
-	$(ptktmpdir)\tkZinc.obj \
-	$(ptktmpdir)\OverlapMan.obj \
-	$(ptktmpdir)\WinPort.obj \
-	$(ptktmpdir)\Image.obj
-
-DLL=Tkzinc.dll
+TKDLLOBJS = $(tmpdir)\Track.obj $(tmpdir)\Tabular.obj \
+	$(tmpdir)\Reticle.obj $(tmpdir)\Map.obj \
+	$(tmpdir)\Rectangle.obj $(tmpdir)\Arc.obj \
+	$(tmpdir)\Curve.obj $(tmpdir)\Item.obj  \
+#	$(tmpdir)\PostScript.obj $(tmpdir)\perfos.obj \
+	$(tmpdir)\MapInfo.obj $(tmpdir)\Attrs.obj \
+	$(tmpdir)\Draw.obj $(tmpdir)\Geo.obj \
+	$(tmpdir)\List.obj $(tmpdir)\Transfo.obj \
+	$(tmpdir)\Group.obj $(tmpdir)\Icon.obj \
+	$(tmpdir)\Text.obj $(tmpdir)\Color.obj \
+	$(tmpdir)\Field.obj $(tmpdir)\Triangles.obj \
+	$(tmpdir)\Window.obj $(tmpdir)\tkZinc.obj \
+	$(tmpdir)\OverlapMan.obj $(tmpdir)\WinPort.obj \
+	$(tmpdir)\Image.obj $(tmpdir)\dict.obj $(tmpdir)\geom.obj \
+	$(tmpdir)\memalloc.obj $(tmpdir)\mesh.obj $(tmpdir)\normal.obj \
+	$(tmpdir)\priorityq.obj $(tmpdir)\render.obj \
+	$(tmpdir)\sweep.obj $(tmpdir)\tess.obj $(tmpdir)\tessmono.obj
+
+PTKDLLOBJS = $(tmpdir)\Track.obj $(tmpdir)\Tabular.obj \
+	$(tmpdir)\Reticle.obj $(tmpdir)\Map.obj \
+	$(tmpdir)\Rectangle.obj $(tmpdir)\Arc.obj \
+	$(tmpdir)\Curve.obj $(tmpdir)\Item.obj \
+#	$(tmpdir)\PostScript.obj $(tmpdir)\perfos.obj \
+	$(tmpdir)\MapInfo.obj $(tmpdir)\Attrs.obj $(tmpdir)\Draw.obj \
+	$(tmpdir)\Geo.obj $(tmpdir)\List.obj $(tmpdir)\Transfo.obj \
+	$(tmpdir)\Group.obj $(tmpdir)\Icon.obj $(tmpdir)\Text.obj \
+	$(tmpdir)\Color.obj $(tmpdir)\Field.obj $(tmpdir)\Triangles.obj \
+	$(tmpdir)\Window.obj $(tmpdir)\tkZinc.obj $(tmpdir)\OverlapMan.obj \
+	$(tmpdir)\WinPort.obj $(tmpdir)\Image.obj
+
+DLL=Tkzinc$(MAJOR)$(MINOR)$(PATCHLVL).dll
 PTKAR=ptkzinc.lib
 
-$(DLL): $(TKDLLOBJS)
-	$(LD) $(DLLLFLAGS) $(TKLIBS) -out:$@ $(TKDLLOBJS)
+$(srcdir)/$(DLL): $(TKDLLOBJS)
+	$(LD) $(DLLLFLAGS) $(TKLIBS) /OUT:$@ $(TKDLLOBJS)
+	@"$(WISH)" <<
+	package require Tk
+	pkg_mkIndex -load Tk $(srcdir) $(DLL)
+	exit
+<<
 
-$(PTKAR): $(PTKDLLOBJS)
+$(srcdir)/$(PTKAR): $(PTKDLLOBJS)
 	LIB $(PTKDLLOBJS) /OUT:$@
 
-{$(windir)}.c{$(tktmpdir)}.obj:
-	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tktmpdir)\ $<
+{$(windir)}.c{$(tmpdir)}.obj:
+	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $<
+
+{$(genericdir)}.c{$(tmpdir)}.obj:
+	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $<
 
-{$(genericdir)}.c{$(tktmpdir)}.obj:
-	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tktmpdir)\ $<
+{$(tessdir)}.c{$(tmpdir)}.obj:
+	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $<
 
-{$(windir)}.c{$(ptktmpdir)}.obj:
-	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptktmpdir)\ $<
+{$(windir)}.c{$(ptmpdir)}.obj:
+	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptmpdir)\ $<
 
-{$(genericdir)}.c{$(ptktmpdir)}.obj:
-	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptktmpdir)\ $<
+{$(genericdir)}.c{$(ptmpdir)}.obj:
+	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptmpdir)\ $<
 
 mostlyclean:
 	$(RM) *.bak *~ $(tmpdir)\*.obj
 clean:
-	$(RM) *.bak *~ $(tmpdir)\*.obj *.dll
+	$(RM) $(tmpdir)\*.obj $(tmpdir)\*.dll $(tmpdir)\*.lib $(tmpdir)\*.exp $(tmpdir)\pkgIndex.tcl $(tmpdir)\*.pch