diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/.cvsignore | 3 | ||||
| -rw-r--r-- | win/makefile.vc | 18 |
3 files changed, 13 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2010-03-12 Jan Nijtmans <nijtmans@users.sf.net> + + * win/makefile.vc Fix [Bug 2967340]: Static build failure + * win/.cvsignore + 2010-03-09 Andreas Kupries <andreask@activestate.com> * generic/tclIORChan.c: [Bug 2936225]: Thanks to Alexandre Ferrieux diff --git a/win/.cvsignore b/win/.cvsignore index 1ebb703..04c3b08 100644 --- a/win/.cvsignore +++ b/win/.cvsignore @@ -22,3 +22,6 @@ config.status *.lib *.exp *.res +*.pch +*.x +*.vc diff --git a/win/makefile.vc b/win/makefile.vc index 2083aee..f3cb3bc 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -13,7 +13,7 @@ # Copyright (c) 2003-2008 Pat Thoyts. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.175.2.3 2008/08/11 21:57:17 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.175.2.4 2010/03/12 15:32:23 nijtmans Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -77,11 +77,11 @@ the build instructions. # # static = Builds a static library of the core instead of a # dll. The shell will be static (and large), as well. -# msvcrt = Effects the static option only to switch it from +# msvcrt = Affects the static option only to switch it from # using libcmt(d) as the C runtime [by default] to # msvcrt(d). This is useful for static embedding # support. -# staticpkg = Effects the static option only to switch +# staticpkg = Affects the static option only to switch # tclshXX.exe to have the dde and reg extension linked # inside it. # threads = Turns on full multithreading support. @@ -574,12 +574,8 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c $(_VC_MANIFEST_EMBED_DLL) !if $(STATIC_BUILD) -!if $(TCL_USE_STATIC_PACKAGES) -$(TCLDDELIB): -!else $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj - $(lib32) -nologo -out:$@ $(TMP_DIR)\tclWinDde.obj -!endif + $(lib32) -nologo -out:$@ $** !else $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \ @@ -590,12 +586,8 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) !endif !if $(STATIC_BUILD) -!if $(TCL_USE_STATIC_PACKAGES) -$(TCLREGLIB): -!else $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj - $(lib32) -nologo -out:$@ $(TMP_DIR)\tclWinReg.obj -!endif + $(lib32) -nologo -out:$@ $** !else $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB) $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \ |