diff options
| author | Odd Stranne <odd@mullvad.net> | 2018-07-13 09:11:19 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2018-07-13 11:00:38 +0200 |
| commit | adb13677abb8763bd93ed03bacc477726ccbaf3f (patch) | |
| tree | d023359d3172af0d42a02fa38e339f59eb85733d | |
| parent | ee7ca9b8987baa11efedb5d320204237aee087fb (diff) | |
| download | mullvadvpn-adb13677abb8763bd93ed03bacc477726ccbaf3f.tar.xz mullvadvpn-adb13677abb8763bd93ed03bacc477726ccbaf3f.zip | |
Add daemon manifest
| -rw-r--r-- | mullvad-daemon/build.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/mullvad-daemon.manifest | 24 | ||||
| -rw-r--r-- | mullvad-daemon/resources.rc | 8 | ||||
| -rw-r--r-- | mullvad-daemon/version.rc | 2 |
4 files changed, 33 insertions, 3 deletions
diff --git a/mullvad-daemon/build.rs b/mullvad-daemon/build.rs index 246b38d13d..45ce36bdba 100644 --- a/mullvad-daemon/build.rs +++ b/mullvad-daemon/build.rs @@ -15,7 +15,7 @@ fn main() { #[cfg(windows)] { - windres::Build::new().compile("version.rc").unwrap(); + windres::Build::new().compile("resources.rc").unwrap(); } } diff --git a/mullvad-daemon/mullvad-daemon.manifest b/mullvad-daemon/mullvad-daemon.manifest new file mode 100644 index 0000000000..f9e3cce75b --- /dev/null +++ b/mullvad-daemon/mullvad-daemon.manifest @@ -0,0 +1,24 @@ +<?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"> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="requireAdministrator" + uiAccess="false"/> + </requestedPrivileges> + </security> +</trustInfo> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!--The ID below indicates app support for Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!--The ID below indicates app support for Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!--The ID below indicates app support for Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!--The ID below indicates app support for Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + </application> +</compatibility> +</assembly> diff --git a/mullvad-daemon/resources.rc b/mullvad-daemon/resources.rc new file mode 100644 index 0000000000..d55f0136e3 --- /dev/null +++ b/mullvad-daemon/resources.rc @@ -0,0 +1,8 @@ +IDI_MAIN ICON "../dist-assets/icon.ico" + +#include "version.rc" + +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mullvad-daemon.manifest" diff --git a/mullvad-daemon/version.rc b/mullvad-daemon/version.rc index 70733c046b..1c7360bbc0 100644 --- a/mullvad-daemon/version.rc +++ b/mullvad-daemon/version.rc @@ -1,7 +1,5 @@ #include "../dist-assets/windows/version.h" -IDI_MAIN ICON "../dist-assets/icon.ico" - 1 VERSIONINFO FILEVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 |