diff options
| author | davygrvy <davygrvy@pobox.com> | 2002-02-06 12:20:26 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2002-02-06 12:20:26 (GMT) |
| commit | 28252f3f3dc415d01cd7ec431e9e31cbcfefcd7d (patch) | |
| tree | d45def67dffb6932118e2a2a45873517d898ab95 | |
| parent | 9e617efd893cea22ba89d990b56c50c5c39fee22 (diff) | |
| download | tcl-28252f3f3dc415d01cd7ec431e9e31cbcfefcd7d.zip tcl-28252f3f3dc415d01cd7ec431e9e31cbcfefcd7d.tar.gz tcl-28252f3f3dc415d01cd7ec431e9e31cbcfefcd7d.tar.bz2 | |
One large bug fixed with neglecting to disable otimizations for a symbols build.
| -rw-r--r-- | win/makefile.vc | 9 | ||||
| -rw-r--r-- | win/rules.vc | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 1f28ab5..8f3ef36 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001 Tomasoft Engineering. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.77.2.2 2002/02/05 23:05:17 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.77.2.3 2002/02/06 12:20:26 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -320,7 +320,7 @@ TCL_DEFINES = $(OPTDEFINES) #--------------------------------------------------------------------- !if $(DEBUG) -cdebug = -Z7 -WX -Ox +cdebug = -Z7 -WX -Od !else !if $(OPTIMIZING) # This cranks the optimization level to maximize speed @@ -393,6 +393,7 @@ test: setup $(TCLTEST) dlls $(CAT32) !if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE" $(TCLTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) !else + @echo Please wait while the tests are collected... $(TCLTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) > tests.log type tests.log | more !endif @@ -446,7 +447,7 @@ $(TCLDDEDLL): $(TMP_DIR)\tclWinDde.obj !endif !else $(TCLDDEDLL): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) - $(link32) $(ldebug) $(dlllflags) -out:$@ $** $(baselibs) + $(link32) $(dlllflags) $(ldebug) -out:$@ $** $(baselibs) -@del $*.exp -@del $*.lib !endif @@ -639,7 +640,7 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c # be built as DLL objects but none of the symbols should be exported $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c - $(cc32) $(cdebug) $(cflags) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $? + $(cc32) $(cflags) $(cdebug) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $? #--------------------------------------------------------------------- diff --git a/win/rules.vc b/win/rules.vc index 00d6c4c..e19b806 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -10,7 +10,7 @@ # Copyright (c) 2001 Tomasoft Engineering. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.4.2.2 2002/02/05 23:05:17 davygrvy Exp $ +# RCS: @(#) $Id: rules.vc,v 1.4.2.3 2002/02/06 12:20:26 davygrvy Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -173,6 +173,7 @@ TCL_COMPILE_DEBUG = 0 # Test for compiler features #---------------------------------------------------------- +!if !$(DEBUG) ### test for optimizations !if [ $(cc32) -nologo -Ox -c -Zs -TC -Fdtemp nul 2>&1 | find "D4002" ] !message *** Compiler has 'optimizations' @@ -184,10 +185,11 @@ OPTIMIZING = 0 ### Clean-up temp files after tests. !if [ @for %d in (temp.idb temp.pdb) do @if exist %d erase %d ] +!else +OPTIMIZING = 0 !endif - OPTDEFINES = -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) !if $(TCL_MEM_DEBUG) OPTDEFINES = -DTCL_MEM_DEBUG |