diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:03:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:03:42 (GMT) |
| commit | ea8d7323cde1bb00e885b28cf0544b16801f5b6c (patch) | |
| tree | 1c627453156eb230ed4f4d8fe72302c9b96a6d02 /win | |
| parent | ac0122ded4c94048193893bbc2439304bd03338c (diff) | |
| download | tk-ea8d7323cde1bb00e885b28cf0544b16801f5b6c.zip tk-ea8d7323cde1bb00e885b28cf0544b16801f5b6c.tar.gz tk-ea8d7323cde1bb00e885b28cf0544b16801f5b6c.tar.bz2 | |
No need for separate tktest manifest: just re-use the one from wish. Give tktest.exe a version-number
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 10 | ||||
| -rw-r--r-- | win/rc/tktest.rc | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 660da96..139369f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -119,7 +119,7 @@ TTK_SQUARE_WIDGET = 0 WISHC = "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe"
-TKTEST = "$(OUT_DIR)\$(PROJECT)test.exe"
+TKTEST = "$(OUT_DIR)\$(PROJECT)test$(VERSION)$(SUFX).exe"
CAT32 = "$(OUT_DIR)\cat32.exe"
WISHOBJS = \
@@ -582,12 +582,6 @@ $(TMP_DIR)\wish.exe.manifest: $(WIN_DIR)\wish.exe.manifest.in @TK_WIN_VERSION@ $(DOTVERSION).0.0
<<
-$(TMP_DIR)\tktest.exe.manifest: $(WIN_DIR)\tktest.exe.manifest.in
- @nmakehlp -s << $** >$@
-@MACHINE@ $(MACHINE:IX86=X86)
-@TK_WIN_VERSION@ $(DOTVERSION).0.0
-<<
-
#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will
# improve incremental build accuracy without having to resort to a
@@ -649,7 +643,7 @@ $< $(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
-$(TMP_DIR)\tktest.res: $(TMP_DIR)\tktest.exe.manifest
+$(TMP_DIR)\tktest.res: $(TMP_DIR)\wish.exe.manifest
.SUFFIXES:
.SUFFIXES:.c .rc
diff --git a/win/rc/tktest.rc b/win/rc/tktest.rc index e97dfbe..7bfd44b 100644 --- a/win/rc/tktest.rc +++ b/win/rc/tktest.rc @@ -47,7 +47,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tktest Application\0" - VALUE "OriginalFilename", "tktest.exe\0" + VALUE "OriginalFilename", "tktest" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" VALUE "FileVersion", TK_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0" VALUE "ProductName", "Tk " TK_VERSION " for Windows\0" @@ -83,4 +83,4 @@ app ICON DISCARDABLE "wish.ico" #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 #endif -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "tktest.exe.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wish.exe.manifest" |