diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2007-11-17 21:47:02 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-11-17 21:47:02 (GMT) |
| commit | 04b391c33f006864aea08854a9426395ffa9f8c7 (patch) | |
| tree | 176c3ba671bb758bee6cf274b30592a380adc2da | |
| parent | 4d5ffbf34a5c45ae09e3cc0b930b9ab5af59047a (diff) | |
| download | tk-04b391c33f006864aea08854a9426395ffa9f8c7.zip tk-04b391c33f006864aea08854a9426395ffa9f8c7.tar.gz tk-04b391c33f006864aea08854a9426395ffa9f8c7.tar.bz2 | |
Fix the environment to run only our built version
| -rw-r--r-- | win/makefile.vc | 63 |
1 files changed, 42 insertions, 21 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 7dac494..ee94d7c 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.112 2007/10/17 20:53:06 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.113 2007/11/17 21:47:02 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -534,12 +534,13 @@ tktest: setup $(TKTEST) $(CAT32) test: test-classic test-ttk test-classic: setup $(TKTEST) $(TKLIB) $(CAT32) - set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(TK_LIBRARY) + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= !if $(TCLINSTALL) - set PATH=$(_TCLDIR)\bin;$(PATH) + @set PATH=$(_TCLDIR)\bin;$(PATH) !else - set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) !endif !if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE" $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32) @@ -548,12 +549,13 @@ test-classic: setup $(TKTEST) $(TKLIB) $(CAT32) !endif test-ttk: setup $(TKTEST) $(TKLIB) $(CAT32) - set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(TK_LIBRARY) + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= !if $(TCLINSTALL) - set PATH=$(_TCLDIR)\bin;$(PATH) + @set PATH=$(_TCLDIR)\bin;$(PATH) !else - set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) !endif !if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE" $(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32) @@ -562,32 +564,51 @@ test-ttk: setup $(TKTEST) $(TKLIB) $(CAT32) !endif runtest: setup $(TKTEST) $(TKLIB) $(CAT32) - set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(TK_LIBRARY) + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= !if $(TCLINSTALL) - set PATH=$(_TCLDIR)\bin;$(PATH) + @set PATH=$(_TCLDIR)\bin;$(PATH) !else - set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) !endif $(TKTEST) rundemo: setup $(TKTEST) $(TKLIB) $(CAT32) - set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(TK_LIBRARY) + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= !if $(TCLINSTALL) - set PATH=$(_TCLDIR)\bin;$(PATH) + @set PATH=$(_TCLDIR)\bin;$(PATH) !else - set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) !endif $(TKTEST) $(ROOT)\library\demos\widget shell: setup $(WISH) - set TCL_LIBRARY=$(TCL_LIBRARY) - set TK_LIBRARY=$(TK_LIBRARY) - $(WISH) << - console show + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= +!if $(TCLINSTALL) + @set PATH=$(_TCLDIR)\bin;$(PATH) +!else + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) +!endif + $(WISH) << + console show << +dbgshell: setup $(WISH) + @set TCL_LIBRARY=$(TCL_LIBRARY:\=/) + @set TK_LIBRARY=$(TK_LIBRARY:\=/) + @set TCLLIBPATH= +!if $(TCLINSTALL) + @set PATH=$(_TCLDIR)\bin;$(PATH) +!else + @set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) +!endif + windbg $(WISH) + setup: @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) @if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) |