diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-12-05 22:15:04 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-12-05 22:15:04 +0300 |
| commit | 61a02a7aa1cabc504da3e5ca55f7e65d9b7aaf50 (patch) | |
| tree | f4906fbb8436ab02fe2ebcc0dcc3d2451a2424dd /release/windows | |
| parent | 9febff7e14c564fc560f48626817350a1bf8086f (diff) | |
Cleanup: Windows Manifest usage.
We had a manifest file, but it was seemingly not used, some
settings were done using linker pragmas, some of them visual
studio would set by default for us, others where not set at all.
This patch changes:
- Single manifest file where we can maintain all settings in
a single location, removal of any linker pragmas related to
the manifest.
- Compatibly settings for win vista - win10, without this any
call to any of the GetVersion and related functions (GetVersionEx,
VerifyVersionInfo, IsWindowsXxxx) will by default say we are
on vista and OS specific optimizations in external libraries may
be missed.
-Rather than having it in the .RC file in an #ifdef which may
or may not trigger depending on the build tool used, we tell
cmake to treat it as a source file and it will do the right
thing for both the ninja and visual studio generators.
Differential Revision: https://developer.blender.org/D6136
Reviewers: brecht
Diffstat (limited to 'release/windows')
| -rw-r--r-- | release/windows/icons/blender.exe.manifest | 28 | ||||
| -rw-r--r-- | release/windows/icons/winblender.rc | 1 |
2 files changed, 27 insertions, 2 deletions
diff --git a/release/windows/icons/blender.exe.manifest b/release/windows/icons/blender.exe.manifest index a43d11b21a0..ceee357ecda 100644 --- a/release/windows/icons/blender.exe.manifest +++ b/release/windows/icons/blender.exe.manifest @@ -7,4 +7,30 @@ </requestedPrivileges> </security> </trustInfo> -</assembly> + <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> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly>
\ No newline at end of file diff --git a/release/windows/icons/winblender.rc b/release/windows/icons/winblender.rc index ba3363aacc5..a0dff81b711 100644 --- a/release/windows/icons/winblender.rc +++ b/release/windows/icons/winblender.rc @@ -7,7 +7,6 @@ #define STRINGIFY_(x) #x #define STRINGIFY(x) STRINGIFY_(x) #define BLEN_VER_RC_STR STRINGIFY(BLEN_VER_RC_STR_M) - 1 RT_MANIFEST "blender.exe.manifest" #endif APPICON ICON DISCARDABLE "winblender.ico" |