move windows out of source dir

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 834babf7585c565e98717d419e4a06f12578bcfc..afdbc644b4e2a75a364a90f543a9a10d1f98ac43 100644 (file)
--- 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_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_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)
        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
similarity index 100%
rename from source/icons/blender.exe.manifest
rename to release/windows/icons/blender.exe.manifest

diff --git a/source/icons/winblender.ico b/release/windows/icons/winblender.ico
similarity index 100%
rename from source/icons/winblender.ico
rename to release/windows/icons/winblender.ico

diff --git a/source/icons/winblender.rc b/release/windows/icons/winblender.rc
similarity index 100%
rename from source/icons/winblender.rc
rename to release/windows/icons/winblender.rc

diff --git a/source/icons/winblenderfile.ico b/release/windows/icons/winblenderfile.ico
similarity index 100%
rename from source/icons/winblenderfile.ico
rename to release/windows/icons/winblenderfile.ico

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 6ad17060231ac305ef2a15342be336bbee46d7b6..4b828408e459c63f84994af8000c42c4ef467f87 100644 (file)
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -54,7 +54,10 @@ if(WIN32 AND NOT UNIX)
                )
        endif()
 
                )
        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
 
        install(TARGETS blenderplayer
                        COMPONENT Blenderplayer

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 72c51e4dd7176ac899744f34497a65a5ed3047fb..25dfb25a05cfa081fe8d9f41812fa29b13f2631b 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -130,7 +130,7 @@ if(WIN32 AND NOT UNIX)
 
 
        list(APPEND SRC
 
 
        list(APPEND SRC

-               ../icons/winblender.rc
+               ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc

        )
 endif()
 
        )
 endif()
 


@@ -1094,7 +1094,7 @@ setup_liblinks(blender)
 if(WIN32 AND NOT WITH_PYTHON_MODULE)
        set(LAUNCHER_SRC
                creator_launch_win.c
 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})
        )
        add_executable(blender-launcher ${LAUNCHER_SRC})
        target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS})