summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-21 16:20:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-21 16:20:01 (GMT)
commitfd3c38f894a7cce3d725b60f8d5cead803d9ff6c (patch)
tree5fd91fd4116e05ffcfb6b5bbfea8863a3cf8ede5
parent91582a5e3b0cc2931ad1232c59719d602d95bfc8 (diff)
downloadtcl-fd3c38f894a7cce3d725b60f8d5cead803d9ff6c.zip
tcl-fd3c38f894a7cce3d725b60f8d5cead803d9ff6c.tar.gz
tcl-fd3c38f894a7cce3d725b60f8d5cead803d9ff6c.tar.bz2
Modify makefile.vc for Windows 8.1 support
-rw-r--r--win/makefile.vc10
1 files changed, 9 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index d9570b9..4466439 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -899,6 +899,12 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.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
@@ -958,12 +964,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