summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authordavygrvy <davygrvy@noemail.net>2001-11-13 04:30:51 (GMT)
committerdavygrvy <davygrvy@noemail.net>2001-11-13 04:30:51 (GMT)
commit7ca17150e79f70cfe6f3593b1d1d7749bfc1f9fc (patch)
tree24ea29d6b10d4d17797fab75a54b76f6e63bc58b /win/makefile.vc
parent9c9f05a5121b2cc6bcb83d1b58fc3e5edb14a982 (diff)
downloadtcl-7ca17150e79f70cfe6f3593b1d1d7749bfc1f9fc.zip
tcl-7ca17150e79f70cfe6f3593b1d1d7749bfc1f9fc.tar.gz
tcl-7ca17150e79f70cfe6f3593b1d1d7749bfc1f9fc.tar.bz2
* win/buildall.vc.bat(new):
* win/makefile.vc: Small fix with deriving the "OriginalFilename" string in the .rc scripts. Added a quick batchfile for building the entire thing. FossilOrigin-Name: e6067623d57a622302d78be3538c051e523a1d6e
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc23
1 files changed, 18 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 21b01fa..709314e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001 Tomasoft Engineering.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.72 2001/11/10 10:38:47 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.73 2001/11/13 04:30:51 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -421,9 +421,13 @@ $(TCLIMPLIB): $(TCLLIB)
$(TCLLIB): $(TCLOBJS)
!if $(STATIC_BUILD)
- $(lib32) -nologo -out:$@ $**
+ $(lib32) -nologo -out:$@ @<<
+$**
+<<
!else
- $(link32) $(ldebug) $(dlllflags) -out:$@ $(winlibs) $**
+ $(link32) $(ldebug) $(dlllflags) -out:$@ $(winlibs) @<<
+$**
+<<
-@del $*.exp
!endif
@@ -692,8 +696,17 @@ $<
<<
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
- $(rc32) -fo $@ -r -i $(GENERICDIR) $(include32) -D__WIN32__ \
- $(TCL_DEFINES) -d DEBUG=$(DEBUG) $<
+ $(rc32) -fo $@ -r -i $(GENERICDIR) -D__WIN32__ \
+!if $(DEBUG)
+ -d DEBUG \
+!endif
+!if $(TCL_THREADS)
+ -d TCL_THREADS \
+!endif
+!if $(STATIC_BUILD)
+ -d STATIC_BUILD \
+!endif
+ $<
#---------------------------------------------------------------------