From 61a02a7aa1cabc504da3e5ca55f7e65d9b7aaf50 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Thu, 5 Dec 2019 12:15:04 -0700 Subject: 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 --- release/windows/icons/winblender.rc | 1 - 1 file changed, 1 deletion(-) (limited to 'release/windows/icons/winblender.rc') 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" -- cgit v1.2.3