diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2013-12-30 08:49:27 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2013-12-30 08:49:27 (GMT) |
| commit | 0c849efd0161d740e6177ed756144d91d17b6f19 (patch) | |
| tree | a1ab15eacb72bafd13935b71e27b25de4570ef9a /win/makefile.vc | |
| parent | 188194ec060834fbdf65f2072d14b1f70805d072 (diff) | |
| parent | 1749e8cdf33e8232f22acc08f9ce4301b00ba7eb (diff) | |
| download | tcl-0c849efd0161d740e6177ed756144d91d17b6f19.zip tcl-0c849efd0161d740e6177ed756144d91d17b6f19.tar.gz tcl-0c849efd0161d740e6177ed756144d91d17b6f19.tar.bz2 | |
merge main working branch
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 10 |
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 |