Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-12-05 22:15:04 +0300
committerRay Molenkamp <github@lazydodo.com>2019-12-05 22:15:04 +0300
commit61a02a7aa1cabc504da3e5ca55f7e65d9b7aaf50 (patch)
treef4906fbb8436ab02fe2ebcc0dcc3d2451a2424dd /source
parent9febff7e14c564fc560f48626817350a1bf8086f (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 'source')
-rw-r--r--source/creator/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
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()