diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:22:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:22:42 (GMT) |
| commit | a1db76f0763b340c0338edbf4cf087c881bf8b8d (patch) | |
| tree | e6650cbc2d0cf2f95c3c99ff1c04bcf3f5aa7510 /win/makefile.vc | |
| parent | 4bf05437d0cb7b72c578c228b5123f6b13855899 (diff) | |
| parent | f6c05909e3838a853d9dc699e0f13c36a768bd43 (diff) | |
| download | tcl-a1db76f0763b340c0338edbf4cf087c881bf8b8d.zip tcl-a1db76f0763b340c0338edbf4cf087c881bf8b8d.tar.gz tcl-a1db76f0763b340c0338edbf4cf087c881bf8b8d.tar.bz2 | |
Fix [https://core.tcl-lang.org/tk/info/1ca3c8d9da|1ca3c8d9da]: nmake build with OPTS=static
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 72f4957..232bd4f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -223,7 +223,7 @@ TCLREGLIB = $(OUT_DIR)\$(TCLREGLIBNAME) TCLDDELIBNAME = $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
TCLDDELIB = $(OUT_DIR)\$(TCLDDELIBNAME)
-TCLTEST = $(OUT_DIR)\$(PROJECT)test.exe
+TCLTEST = $(OUT_DIR)\$(PROJECT)test$(VERSION)$(SUFX:t=).exe
TCLTESTRAW = $(TCLTEST:.exe=-raw.exe)
TCLSHOBJS = \
@@ -239,7 +239,8 @@ TCLTESTOBJS = \ !if !$(STATIC_BUILD)
$(OUT_DIR)\tommath.lib \
!endif
- $(TMP_DIR)\testMain.obj
+ $(TMP_DIR)\testMain.obj \
+ $(TMP_DIR)\tcltest.res
COREOBJS = \
$(TMP_DIR)\regcomp.obj \
@@ -581,6 +582,7 @@ $(TCLSTUBLIB): $(TCLSTUBOBJS) $(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
$(CONEXECMD) -stack:2300000 $**
+ copy $(TMP_DIR)\tclsh.exe.manifest $(TCLSH).manifest
$(_VC_MANIFEST_EMBED_EXE)
!if $(TCL_EMBED_SCRIPTS) && $(STATIC_BUILD)
$(COPY) $@ $(TCLSHRAW)
@@ -589,6 +591,7 @@ $(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB) $(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
$(CONEXECMD) -stack:2300000 $**
+ copy $(TMP_DIR)\tclsh.exe.manifest $(TCLTEST).manifest
$(_VC_MANIFEST_EMBED_EXE)
!if $(TCL_EMBED_SCRIPTS) && $(STATIC_BUILD)
$(COPY) $@ $(TCLTESTRAW)
@@ -1008,6 +1011,7 @@ $< $(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WIN_DIR)\tclsh.rc
+$(TMP_DIR)\tcltest.res: $(TMP_DIR)\tclsh.exe.manifest $(WIN_DIR)\tcltest.rc
#---------------------------------------------------------------------
# Installation.
|