diff options
author | Ron Yorston <rmy@pobox.com> | 2019-02-21 11:29:12 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-02-21 11:53:55 +0000 |
commit | 20dfd84edd1b45b78a284bf75ef711726a4e8415 (patch) | |
tree | 65a54303ce20a05a50132a4efb2827d8e62ed6fc /win32 | |
parent | 4dbb0461e21a10ae96ccde2ca22871079fc37566 (diff) | |
download | busybox-w32-20dfd84edd1b45b78a284bf75ef711726a4e8415.tar.gz busybox-w32-20dfd84edd1b45b78a284bf75ef711726a4e8415.tar.bz2 busybox-w32-20dfd84edd1b45b78a284bf75ef711726a4e8415.zip |
win32: use manifest provided by MinGW-w64
The manifest included here wasn't effective in telling Windows
about version compatibility. Use the default manifest provided
by MinGW-w64 instead.
On Fedora this requires installing the mingw32-windows-default-manifest
and/or mingw64-windows-default-manifest packages.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/resources/Kbuild.src | 4 | ||||
-rw-r--r-- | win32/resources/busybox-w32.manifest.src | 25 | ||||
-rw-r--r-- | win32/resources/resources.rc | 4 |
3 files changed, 0 insertions, 33 deletions
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src index 7cc010613..1900d1872 100644 --- a/win32/resources/Kbuild.src +++ b/win32/resources/Kbuild.src | |||
@@ -25,7 +25,3 @@ quiet_cmd_windres = WINDRES $@ | |||
25 | 25 | ||
26 | win32/resources/resources.o: win32/resources/resources.rc .config | 26 | win32/resources/resources.o: win32/resources/resources.rc .config |
27 | win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico | 27 | win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico |
28 | win32/resources/resources.o: win32/resources/busybox-w32.manifest | ||
29 | |||
30 | win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config | ||
31 | @sed -b "s/VERSION/$(BB_VER)/" $< >$@ | ||
diff --git a/win32/resources/busybox-w32.manifest.src b/win32/resources/busybox-w32.manifest.src deleted file mode 100644 index c75dbdb96..000000000 --- a/win32/resources/busybox-w32.manifest.src +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
2 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | ||
3 | <assemblyIdentity type="win32" name="busybox-w32" version="VERSION" /> | ||
4 | <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> | ||
5 | <security> | ||
6 | <requestedPrivileges> | ||
7 | <requestedExecutionLevel level="asInvoker" uiAccess="false" /> | ||
8 | </requestedPrivileges> | ||
9 | </security> | ||
10 | </trustInfo> | ||
11 | <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> | ||
12 | <application> | ||
13 | <!-- Windows Vista --> | ||
14 | <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> | ||
15 | <!-- Windows 7 --> | ||
16 | <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> | ||
17 | <!-- Windows 8 --> | ||
18 | <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> | ||
19 | <!-- Windows 8.1 --> | ||
20 | <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> | ||
21 | <!-- Windows 10 --> | ||
22 | <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> | ||
23 | </application> | ||
24 | </compatibility> | ||
25 | </assembly> | ||
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc index f77a3bcc9..d8b9d6407 100644 --- a/win32/resources/resources.rc +++ b/win32/resources/resources.rc | |||
@@ -32,7 +32,3 @@ BEGIN | |||
32 | END | 32 | END |
33 | END | 33 | END |
34 | #endif | 34 | #endif |
35 | |||
36 | #if ENABLE_FEATURE_MANIFEST | ||
37 | 1 RT_MANIFEST "busybox-w32.manifest" | ||
38 | #endif | ||