diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-03 15:39:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-03 15:39:59 (GMT) |
| commit | f34df1ac978994a9a53c504f183df78a63f816ef (patch) | |
| tree | 5fe3ebf7b32cf55cbcc3b91ea859737cfc7dccab /win | |
| parent | 1f8c4346cf4b475f23b9b7507e46dab73cd2fd91 (diff) | |
| download | tk-f34df1ac978994a9a53c504f183df78a63f816ef.zip tk-f34df1ac978994a9a53c504f183df78a63f816ef.tar.gz tk-f34df1ac978994a9a53c504f183df78a63f816ef.tar.bz2 | |
Possible fix for [1ca3c8d9da]: nmake build with OPTS=static
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 10 | ||||
| -rw-r--r-- | win/tktest.exe.manifest.in | 53 |
2 files changed, 62 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 250303e..660da96 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -135,7 +135,8 @@ TKTESTOBJS = \ $(TMP_DIR)\tkSquare.obj \
$(TMP_DIR)\tkTest.obj \
$(TMP_DIR)\tkOldTest.obj \
- $(TMP_DIR)\tkWinTest.obj
+ $(TMP_DIR)\tkWinTest.obj \
+ $(TMP_DIR)\tktest.res
XLIBOBJS = \
$(TMP_DIR)\xcolors.obj \
@@ -581,6 +582,12 @@ $(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
@@ -642,6 +649,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
.SUFFIXES:
.SUFFIXES:.c .rc
diff --git a/win/tktest.exe.manifest.in b/win/tktest.exe.manifest.in new file mode 100644 index 0000000..62b585e --- /dev/null +++ b/win/tktest.exe.manifest.in @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" + xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <assemblyIdentity + version="@TK_WIN_VERSION@" + processorArchitecture="@MACHINE@" + name="Tcl.Tk.tktest" + type="win32" + /> + <description>Tcl/Tk test (tktest)</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> + </trustInfo> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + <!-- Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> + </compatibility> + <asmv3:application> + <asmv3:windowsSettings + xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> + <dpiAware>true</dpiAware> + </asmv3:windowsSettings> + </asmv3:application> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="@MACHINE@" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> |