diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 6 | ||||
| -rw-r--r-- | release/windows/icons/blender.exe.manifest | 28 | ||||
| -rw-r--r-- | release/windows/icons/winblender.rc | 1 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 |
4 files changed, 28 insertions, 8 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index c86accf4ede..323722173d4 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -28,12 +28,6 @@ # define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */ #endif -/* clang-format off */ -#pragma comment(linker,"\"/manifestdependency:type='win32' \ -name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \ -processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") -/* clang-format on */ - #include <commctrl.h> #include <shlobj.h> #include <tlhelp32.h> 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" diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 75cf841f89d..01951fb9790 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -149,6 +149,7 @@ if(WIN32 AND NOT UNIX) list(APPEND SRC ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc + ${CMAKE_SOURCE_DIR}/release/windows/icons/blender.exe.manifest ) endif() |