diff options
| -rw-r--r-- | build_files/cmake/packaging.cmake | 4 | ||||
| -rw-r--r-- | release/windows/icons/blender.exe.manifest (renamed from source/icons/blender.exe.manifest) | 0 | ||||
| -rw-r--r-- | release/windows/icons/winblender.ico (renamed from source/icons/winblender.ico) | bin | 295606 -> 295606 bytes | |||
| -rw-r--r-- | release/windows/icons/winblender.rc (renamed from source/icons/winblender.rc) | 0 | ||||
| -rw-r--r-- | release/windows/icons/winblenderfile.ico (renamed from source/icons/winblenderfile.ico) | bin | 25214 -> 25214 bytes | |||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 |
7 files changed, 8 insertions, 5 deletions
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 834babf7585..afdbc644b4e 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -67,11 +67,11 @@ if(WIN32) set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender") set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender") - set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico) + set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt) - set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico) + set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A") set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template) diff --git a/source/icons/blender.exe.manifest b/release/windows/icons/blender.exe.manifest index a43d11b21a0..a43d11b21a0 100644 --- a/source/icons/blender.exe.manifest +++ b/release/windows/icons/blender.exe.manifest diff --git a/source/icons/winblender.ico b/release/windows/icons/winblender.ico Binary files differindex e6b368c562b..e6b368c562b 100644 --- a/source/icons/winblender.ico +++ b/release/windows/icons/winblender.ico diff --git a/source/icons/winblender.rc b/release/windows/icons/winblender.rc index 244c2cb2e2c..244c2cb2e2c 100644 --- a/source/icons/winblender.rc +++ b/release/windows/icons/winblender.rc diff --git a/source/icons/winblenderfile.ico b/release/windows/icons/winblenderfile.ico Binary files differindex 254480b6ed5..254480b6ed5 100644 --- a/source/icons/winblenderfile.ico +++ b/release/windows/icons/winblenderfile.ico diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 6ad17060231..4b828408e45 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -54,7 +54,10 @@ if(WIN32 AND NOT UNIX) ) endif() - add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc) + add_executable( + blenderplayer ${EXETYPE} + bad_level_call_stubs/stubs.c + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc) install(TARGETS blenderplayer COMPONENT Blenderplayer diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 72c51e4dd71..25dfb25a05c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -130,7 +130,7 @@ if(WIN32 AND NOT UNIX) list(APPEND SRC - ../icons/winblender.rc + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc ) endif() @@ -1094,7 +1094,7 @@ setup_liblinks(blender) if(WIN32 AND NOT WITH_PYTHON_MODULE) set(LAUNCHER_SRC creator_launch_win.c - ../icons/winblender.rc + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc ) add_executable(blender-launcher ${LAUNCHER_SRC}) target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS}) |