diff options
| author | Lecoanet | 2005-09-12 13:15:32 +0000 |
|---|---|---|
| committer | Lecoanet | 2005-09-12 13:15:32 +0000 |
| commit | 331e565c56ed92c93dd8415791b0296e4ecb739f (patch) | |
| tree | 9b56dd1d861655c06bd23736e5ebdbed5056cf52 /win | |
| parent | e74f844d3ae822f4e31351ca550311edf4be26da (diff) | |
| download | tkzinc-331e565c56ed92c93dd8415791b0296e4ecb739f.zip tkzinc-331e565c56ed92c93dd8415791b0296e4ecb739f.tar.gz tkzinc-331e565c56ed92c93dd8415791b0296e4ecb739f.tar.bz2 tkzinc-331e565c56ed92c93dd8415791b0296e4ecb739f.tar.xz | |
Changed the debug flags
Suppressed the conditional for GL_DAMAGE
Rearranged the include and library directives
Compilation with stubs and threads enabled
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/win/makefile.vc.in b/win/makefile.vc.in index a11dc34..4808ca1 100644 --- a/win/makefile.vc.in +++ b/win/makefile.vc.in @@ -42,16 +42,17 @@ tmpdir = buildtcl tcl_inc_dir = $(srcdir)\..\tcl$(TCLTK_FULL_VER) tk_inc_dir = $(srcdir)\..\tk$(TCLTK_FULL_VER) -INCLUDES = /I$(srcdir)/generic $(include32) +INCLUDES = $(include32) /I$(incdir) /I$(srcdir)/generic \ + /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 # 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 = glu32.lib opengl32.lib -TKLIBS = $(libdir)\tcl$(TCLTK_LIB_VER).lib \ - $(libdir)\tk$(TCLTK_LIB_VER).lib \ - $(GL_LIBS) $(WIN_LIBS) +TKLIBS = $(libdir)\tclstub$(TCLTK_LIB_VER).lib $(libdir)\tkstub$(TCLTK_LIB_VER).lib \ + $(GL_LIBS) $(WIN_LIBS) VERSION = \"$(TKZINC_MAJOR).$(TKZINC_MINOR).$(TKZINC_PATCHLVL)\" @@ -66,19 +67,20 @@ VERSION = \"$(TKZINC_MAJOR).$(TKZINC_MINOR).$(TKZINC_PATCHLVL)\" # GL_DAMAGE redraw only modified areas # SHAPE include code for reshaping windows. # -DFLAGS= /DOM /DATC /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG +DFLAGS= /DOM /DATC /DGL /DGL_PRINT_CONFIG #DFLAGS= /DOM #DFLAGS = /DTCL_MEM_DEBUG # Max speed #CDEBUG = /O2 /G6 /Gs # Debug -CDEBUG = /Z7 -Od +CDEBUG = /Zi -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__ +TKCPPFLAGS = /Fp$(tmpdir)\ $(INCLUDES) /DTCL_THREADS=1 /DUSE_TCL_STUBS /DUSE_TK_STUBS /D__STDC__ #LFLAGS = /DEBUG /nologo /machine:IX86 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib -LFLAGS = /nologo /machine:IX86 $(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 |