move windows out of source dir
authorCampbell Barton <ideasman42@gmail.com>
Sun, 7 Feb 2016 09:58:58 +0000 (20:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 7 Feb 2016 09:58:58 +0000 (20:58 +1100)
build_files/cmake/packaging.cmake
release/windows/icons/blender.exe.manifest [moved from source/icons/blender.exe.manifest with 100% similarity]
release/windows/icons/winblender.ico [moved from source/icons/winblender.ico with 100% similarity]
release/windows/icons/winblender.rc [moved from source/icons/winblender.rc with 100% similarity]
release/windows/icons/winblenderfile.ico [moved from source/icons/winblenderfile.ico with 100% similarity]
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index 834babf7585c565e98717d419e4a06f12578bcfc..afdbc644b4e2a75a364a90f543a9a10d1f98ac43 100644 (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)
index 6ad17060231ac305ef2a15342be336bbee46d7b6..4b828408e459c63f84994af8000c42c4ef467f87 100644 (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
index 72c51e4dd7176ac899744f34497a65a5ed3047fb..25dfb25a05cfa081fe8d9f41812fa29b13f2631b 100644 (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})