Updated for an easier use with the standard Active Tcl install.

1 files changed, 15 insertions, 46 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index b1be23b..4e65c0a 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -18,8 +18,11 @@
 # $Revision$
 #
 srcdir = ..
-
-SHELL = /bin/sh
+TCLTK_FULL_VER = 8.4.6
+TCLTK_LIB_VER = 84
+TKZINC_MAJOR=3
+TKZINC_MINOR=2
+TKZINC_PATCHLVL = 98
 
 # Visual Studio 6 default
 TOOLS32		= C:\Progra~1\Microsoft Visual Studio\VC98
@@ -30,11 +33,7 @@ include32	= /I"$(TOOLS32)\include"
 CP		= copy
 RM		= del
 
-PERLCONFIG = INSTALLDIRS=perl
-
-INSTALL_PERL = install_perl
-
-prefix = c:\lecoanet
+prefix = c:\Progra~1\Tcl
 exec_prefix = $(prefix)
 
 bindir = $(exec_prefix)\bin
@@ -47,27 +46,20 @@ genericdir = $(srcdir)\generic
 tessdir = $(srcdir)\libtess
 tmpdir = $(srcdir)
 
-tcl_inc_dir = $(prefix)\tcl8.4.2
-tk_inc_dir = $(prefix)\tk8.4.2
+tcl_inc_dir = $(srcdir)\..\tcl$(TCLTK_FULL_VER)
+tk_inc_dir = $(srcdir)\..\tk$(TCLTK_FULL_VER)
 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)
+TCLSH		= $(bindir)\tclsh$(TCLTK_LIB_VER)
+WISH		= $(bindir)\wish$(TCLTK_LIB_VER)
 WIN_LIBS	= user32.lib gdi32.lib ws2_32.lib
-#GL_LIBS	=
 GL_LIBS		= opengl32.lib
-PTKROOT		= c:\perl\site\lib
-TKLIBS		= $(libdir)\tcl$(TCL_TK_VER).lib \
-		  $(libdir)\tk$(TCL_TK_VER).lib \
+TKLIBS		= $(libdir)\tcl$(TCLTK_LIB_VER).lib \
+		  $(libdir)\tk$(TCLTK_LIB_VER).lib \
 		  $(GL_LIBS) $(WIN_LIBS)
-PTKLIBS		= $(PTKROOT)\auto\Tk\Tk.lib $(GL_LIBS) $(WIN_LIBS)
 
-MAJOR=3
-MINOR=2
-PATCHLVL = 91
-VERSION = \"$(MAJOR).$(MINOR).$(PATCHLVL)\"
+VERSION = \"$(TKZINC_MAJOR).$(TKZINC_MINOR).$(TKZINC_PATCHLVL)\"
 
 #
 # Recognized compilation time flags are :
@@ -88,8 +80,7 @@ DFLAGS= /DOM /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG
 # Debug
 CDEBUG = -Z7 -Od
 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
+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 /I$(tk_inc_dir)\xlib /D__STDC__
 
 LFLAGS	= /nologo /machine:IX86 /warn:3 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib
 
@@ -114,20 +105,7 @@ TKDLLOBJS = $(tmpdir)\Track.obj $(tmpdir)\Tabular.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=Tkzinc$(TKZINC_MAJOR)$(TKZINC_MINOR)$(TKZINC_PATCHLVL).dll
 
 $(srcdir)/$(DLL): $(TKDLLOBJS)
 	$(LD) $(DLLLFLAGS) $(TKLIBS) /OUT:$@ $(TKDLLOBJS)
@@ -137,9 +115,6 @@ $(srcdir)/$(DLL): $(TKDLLOBJS)
 	exit
 <<
 
-$(srcdir)/$(PTKAR): $(PTKDLLOBJS)
-	LIB $(PTKDLLOBJS) /OUT:$@
-
 {$(windir)}.c{$(tmpdir)}.obj:
 	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $<
 
@@ -149,12 +124,6 @@ $(srcdir)/$(PTKAR): $(PTKDLLOBJS)
 {$(tessdir)}.c{$(tmpdir)}.obj:
 	$(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $<
 
-{$(windir)}.c{$(ptmpdir)}.obj:
-	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptmpdir)\ $<
-
-{$(genericdir)}.c{$(ptmpdir)}.obj:
-	$(CC) $(PTKCPPFLAGS) $(CFLAGS) -Fo$(ptmpdir)\ $<
-
 mostlyclean:
 	$(RM) *.bak *~ $(tmpdir)\*.obj
 clean: