diff options
| author | nijtmans <nijtmans> | 2009-11-26 07:01:45 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2009-11-26 07:01:45 (GMT) |
| commit | fe3dd38f5e9956ff59341aee24ccc04e0818b19d (patch) | |
| tree | ebfeb9beb09da18d4be3af45520759f7724b591f /win/makefile.vc | |
| parent | b15ddd01de0048a7f37b5195ed7c6b44504fd513 (diff) | |
| download | tcl-fe3dd38f5e9956ff59341aee24ccc04e0818b19d.zip tcl-fe3dd38f5e9956ff59341aee24ccc04e0818b19d.tar.gz tcl-fe3dd38f5e9956ff59341aee24ccc04e0818b19d.tar.bz2 | |
Fix [Bug 2902965] stub related changes
cause tclkit built to break
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index a4e21e2..484bb1e 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.203 2009/11/23 21:26:32 nijtmans Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.204 2009/11/26 07:01:52 nijtmans Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -420,7 +420,10 @@ PLATFORMOBJS = \ $(TMP_DIR)\tclWinSock.obj \ $(TMP_DIR)\tclWinThrd.obj \ $(TMP_DIR)\tclWinTime.obj \ -!if !$(STATIC_BUILD) +!if $(STATIC_BUILD) + $(TMP_DIR)\tclStubLib.obj + $(TMP_DIR)\tclOOStubLib.obj +!else $(TMP_DIR)\tcl.res !endif @@ -620,8 +623,8 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c !if $(TCL_USE_STATIC_PACKAGES) $(TCLDDELIB): !else -$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj - $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinDde.obj +$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBOBJS) + $(lib32) -nologo $(LINKERFLAGS) -out:$@ $** !endif !else $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) @@ -634,8 +637,8 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) !if $(TCL_USE_STATIC_PACKAGES) $(TCLREGLIB): !else -$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj - $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinReg.obj +$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBOBJS) + $(lib32) -nologo $(LINKERFLAGS) -out:$@ $** !endif !else $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB) |