move windows out of source dir

6 files changed, 6 insertions, 53 deletions

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})
diff --git a/source/icons/blender.exe.manifest b/source/icons/blender.exe.manifest
deleted file mode 100644
index a43d11b21a0..00000000000
--- a/source/icons/blender.exe.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git a/source/icons/winblender.ico b/source/icons/winblender.ico
deleted file mode 100644
index e6b368c562b..00000000000
--- a/source/icons/winblender.ico
+++ /dev/null
diff --git a/source/icons/winblender.rc b/source/icons/winblender.rc
deleted file mode 100644
index 244c2cb2e2c..00000000000
--- a/source/icons/winblender.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#define BLENDERFILE 1
-#define IDR_VERSION1 1
-
-#ifdef WINDRES
-	#include "winresrc.h"
-	#define IDC_STATIC (-1)
-	#define STRINGIFY_(x) #x
-	#define STRINGIFY(x) STRINGIFY_(x)
-	#define BLEN_VER_RC_STR STRINGIFY(BLEN_VER_RC_STR_M)
-	1 RT_MANIFEST "blender.exe.manifest"
-#endif
-
-APPICON ICON DISCARDABLE "winblender.ico"
-BLENDERFILE ICON DISCARDABLE "winblenderfile.ico"
-
-IDR_VERSION1 VERSIONINFO
-FILEVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4
-PRODUCTVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4
-FILEOS 0x00000004
-FILETYPE 0x00000001
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "04090000"
-    BEGIN
-      VALUE "FileVersion", BLEN_VER_RC_STR
-      VALUE "ProductVersion", BLEN_VER_RC_STR
-      VALUE "CompanyName", "Blender Foundation"
-      VALUE "FileDescription", "Blender"
-      VALUE "LegalCopyright", "GPLv2 (Blender Foundation)"
-      VALUE "OriginalFilename", "blender.exe"
-      VALUE "ProductName", "Blender"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 0x0000
-  END
-END
-
diff --git a/source/icons/winblenderfile.ico b/source/icons/winblenderfile.ico
deleted file mode 100644
index 254480b6ed5..00000000000
--- a/source/icons/winblenderfile.ico
+++ /dev/null