diff options
Diffstat (limited to 'win/makefile.vc.in')
| -rw-r--r-- | win/makefile.vc.in | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/win/makefile.vc.in b/win/makefile.vc.in index 62fccd4..b5e5e8a 100644 --- a/win/makefile.vc.in +++ b/win/makefile.vc.in @@ -18,21 +18,27 @@ # $Revision$ # srcdir = .. -TCLTK_FULL_VER = 8.4.6 +TCLTK_FULL_VER = 8.4.9 TCLTK_LIB_VER = 84 TKZINC_MAJOR = @MAJOR_VERSION@ TKZINC_MINOR = @MINOR_VERSION@ TKZINC_PATCHLVL = @PATCHLEVEL@ -# Visual Studio 6 default -TOOLS32 = C:\Progra~1\Microsoft Visual Studio\VC98 -CC = "$(TOOLS32)\bin\cl.exe" -LD = "$(TOOLS32)\bin\link.exe" -link50compat -libpath32 = /LIBPATH:"$(TOOLS32)\lib" -include32 = /I"$(TOOLS32)\include" +CC = cl +LD = link CP = copy RM = del +# +# The SDK lib path should be available in the +# environment variable %LIB% +libpath32 = /LIBPATH:"$(LIB)" +# +# The SDK include path should be available in the +# environment variable %INCLUDE% +include32 = /I$(INCLUDE) /I"C:\Program Files\Microsoft Platform SDK for Windows XP SP2\include\GL" +# +# Default location for ActiveTcl prefix = c:\Tcl exec_prefix = $(prefix) @@ -43,18 +49,17 @@ mandir = $(prefix)\man\man3 windir = $(srcdir)\win genericdir = $(srcdir)\generic -tessdir = $(srcdir)\libtess -tmpdir = $(srcdir) +tmpdir = buildtcl tcl_inc_dir = $(srcdir)\..\tcl$(TCLTK_FULL_VER) tk_inc_dir = $(srcdir)\..\tk$(TCLTK_FULL_VER) -INCLUDES = /I$(srcdir)/generic /I$(srcdir)/libtess $(include32) +INCLUDES = /I$(srcdir)/generic $(include32) # Assume that WISH is already INSTALLED TCLSH = $(bindir)\tclsh$(TCLTK_LIB_VER) WISH = $(bindir)\wish$(TCLTK_LIB_VER) WIN_LIBS = user32.lib gdi32.lib ws2_32.lib -GL_LIBS = opengl32.lib +GL_LIBS = glu32.lib opengl32.lib TKLIBS = $(libdir)\tcl$(TCLTK_LIB_VER).lib \ $(libdir)\tk$(TCLTK_LIB_VER).lib \ $(GL_LIBS) $(WIN_LIBS) @@ -66,23 +71,24 @@ VERSION = \"$(TKZINC_MAJOR).$(TKZINC_MINOR).$(TKZINC_PATCHLVL)\" # # PROFILE ask for profile support # OM include code for internal overlap manager +# ATC include code for atc specific items # GL include code that need GL support. # GL_PRINT_CONFIG display the detected hardware capabilities # GL_DAMAGE redraw only modified areas # SHAPE include code for reshaping windows. # -DFLAGS= /DOM /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG +DFLAGS= /DOM /DATC /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG #DFLAGS= /DOM #DFLAGS = /DTCL_MEM_DEBUG # Max speed -#CDEBUG = -O2 -Gs +#CDEBUG = /O2 /G6 /Gs # Debug -CDEBUG = -Z7 -Od +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 /I$(tk_inc_dir)\xlib /D__STDC__ -LFLAGS = /nologo /machine:IX86 /warn:3 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib +LFLAGS = /DEBUG /nologo /machine:IX86 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib DLLENTRY = @12 DLLLFLAGS = $(LFLAGS) /entry:_DllMainCRTStartup$(DLLENTRY) /dll @@ -100,21 +106,21 @@ TKDLLOBJS = $(tmpdir)\Track.obj $(tmpdir)\Tabular.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 + $(tmpdir)\Image.obj DLL=Tkzinc$(TKZINC_MAJOR)$(TKZINC_MINOR)$(TKZINC_PATCHLVL).dll -$(srcdir)/$(DLL): $(TKDLLOBJS) +$(tmpdir)/$(DLL): $(tmpdir) $(TKDLLOBJS) $(LD) $(DLLLFLAGS) $(TKLIBS) /OUT:$@ $(TKDLLOBJS) @"$(WISH)" << package require Tk - pkg_mkIndex -load Tk $(srcdir) $(DLL) + pkg_mkIndex -load Tk $(tmpdir) $(DLL) exit << +$(tmpdir): + mkdir $(tmpdir) + {$(windir)}.c{$(tmpdir)}.obj: $(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $< |