summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-11-21 16:22:34 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-11-21 16:22:34 (GMT)
commit488cbda4fc68c4f562f9e7c469f5ba77566a403f (patch)
tree1b512465889ba74186cfc4a1e6815de08f236337 /win
parentfd0adce8794499fe1d3f80798cfe33e2f1eec65f (diff)
parent2206826ed73d532744549ef16de080ab8b80c157 (diff)
downloadtcl-488cbda4fc68c4f562f9e7c469f5ba77566a403f.zip
tcl-488cbda4fc68c4f562f9e7c469f5ba77566a403f.tar.gz
tcl-488cbda4fc68c4f562f9e7c469f5ba77566a403f.tar.bz2
Modify makefile.vc for Windows 8.1 support
FossilOrigin-Name: c8998f018b38ff4c0dfff0a00ef0541eb81ba991
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc10
1 files changed, 9 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index b76a939..56bc4b7 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -985,6 +985,12 @@ $(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c
$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
+$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
+ @nmakehlp -s << $** >$@
+@MACHINE@ $(MACHINE:IX86=X86)
+@TCL_WIN_VERSION@ $(TCL_DOTVERSION).0.0
+<<
+
#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will
# improve incremental build accuracy without having to resort to a
@@ -1051,12 +1057,14 @@ $<
<<
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
- $(rc32) -fo $@ -r -i "$(GENERICDIR)" \
+ $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
-d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
-d TCL_THREADS=$(TCL_THREADS) \
-d STATIC_BUILD=$(STATIC_BUILD) \
$<
+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest
+
.SUFFIXES:
.SUFFIXES:.c .rc