| --- blender-2.81a/intern/ghost/CMakeLists.txt.orig 2019-12-09 19:58:14.135870500 +0300 |
| +++ blender-2.81a/intern/ghost/CMakeLists.txt 2019-12-09 19:58:48.297824500 +0300 |
| @@ -271,6 +271,10 @@ |
| ${WINTAB_INC} |
| ) |
| |
| + list(APPEND LIB |
| + comctl32 |
| + ) |
| + |
| list(APPEND SRC |
| intern/GHOST_DisplayManagerWin32.cpp |
| intern/GHOST_DropTargetWin32.cpp |
| 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,7 +149,7 @@ if(WIN32 AND NOT UNIX) |
| |
| list(APPEND SRC |
| ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc |
| - ${CMAKE_BINARY_DIR}/blender.exe.manifest |
| + ${CMAKE_SOURCE_DIR}/release/windows/icons/blender.exe.manifest |
| ) |
| endif() |
| |
| --- /dev/null 2020-02-18 15:56:11.000000000 +0300 |
| +++ blender-2.82/release/windows/icons/blender.exe.manifest 2020-02-18 15:56:02.230820700 +0300 |
| @@ -0,0 +1,36 @@ |
| +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
| +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
| + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> |
| + <security> |
| + <requestedPrivileges> |
| + <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel> |
| + </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> |
| + <dependency> |
| + <dependentAssembly> |
| + <assemblyIdentity |
| + type="Win32" |
| + name="Microsoft.Windows.Common-Controls" |
| + version="6.0.0.0" |
| + processorArchitecture="*" |
| + publicKeyToken="6595b64144ccf1df" |
| + language="*" |
| + /> |
| + </dependentAssembly> |
| + </dependency> |
| +</assembly> |
| --- blender-2.82/release/windows/icons/winblender.rc.orig 2020-02-18 15:51:35.632821800 +0300 |
| +++ blender-2.82/release/windows/icons/winblender.rc 2020-02-18 15:51:56.154990900 +0300 |
| @@ -7,6 +7,7 @@ |
| #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" |