diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 484bb1e..08ac169 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.204 2009/11/26 07:01:52 nijtmans Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.205 2009/12/11 22:52:09 nijtmans Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -420,10 +420,7 @@ PLATFORMOBJS = \ $(TMP_DIR)\tclWinSock.obj \ $(TMP_DIR)\tclWinThrd.obj \ $(TMP_DIR)\tclWinTime.obj \ -!if $(STATIC_BUILD) - $(TMP_DIR)\tclStubLib.obj - $(TMP_DIR)\tclOOStubLib.obj -!else +!if !$(STATIC_BUILD) $(TMP_DIR)\tcl.res !endif @@ -623,7 +620,7 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c !if $(TCL_USE_STATIC_PACKAGES) $(TCLDDELIB): !else -$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBOBJS) +$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(lib32) -nologo $(LINKERFLAGS) -out:$@ $** !endif !else @@ -637,7 +634,7 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) !if $(TCL_USE_STATIC_PACKAGES) $(TCLREGLIB): !else -$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBOBJS) +$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(lib32) -nologo $(LINKERFLAGS) -out:$@ $** !endif !else |