move windows out of source dir

This commit is contained in:
Campbell Barton 2016-02-07 20:58:58 +11:00
parent 578f70f288
commit 8be34580c1
7 changed files with 8 additions and 5 deletions

View File

@ -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)

View File

Before

Width:  |  Height:  |  Size: 289 KiB

After

Width:  |  Height:  |  Size: 289 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -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

View File

@ -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})