diff options
Diffstat (limited to 'source/icons')
| -rw-r--r-- | source/icons/SConscript | 13 | ||||
| -rw-r--r-- | source/icons/blender.exe.manifest | 10 | ||||
| -rw-r--r-- | source/icons/linuxcrossblender.rcscons | 2 | ||||
| -rw-r--r-- | source/icons/winblender.rc | 42 | ||||
| -rw-r--r-- | source/icons/winblender.rcscons | 2 |
5 files changed, 58 insertions, 11 deletions
diff --git a/source/icons/SConscript b/source/icons/SConscript index ca6308781e9..4bb27a7d4fb 100644 --- a/source/icons/SConscript +++ b/source/icons/SConscript @@ -1,9 +1,12 @@ #!/usr/bin/python Import ('env') +import btools -if env['OURPLATFORM'] == 'linuxcross': - source = 'linuxcrossblender.rcscons' -else: - source = 'winblender.rcscons' +env['RCFLAGS'].append("-DWINDRES") +env['RCFLAGS'].append("-DBLEN_VER_RC_STR_M=" + btools.VERSION) +env['RCFLAGS'].append("-DBLEN_VER_RC_1=" + btools.VERSION[0]) +env['RCFLAGS'].append("-DBLEN_VER_RC_2=" + btools.VERSION[2]) +env['RCFLAGS'].append("-DBLEN_VER_RC_3=" + btools.VERSION[3]) +env['RCFLAGS'].append("-DBLEN_VER_RC_4=0") -env.BlenderRes('winresource', source, ['core'], priority=[95]) +env.BlenderRes('winresource', 'winblender.rc', ['core'], priority=[95]) diff --git a/source/icons/blender.exe.manifest b/source/icons/blender.exe.manifest new file mode 100644 index 00000000000..bc13bf4c586 --- /dev/null +++ b/source/icons/blender.exe.manifest @@ -0,0 +1,10 @@ +<?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/linuxcrossblender.rcscons b/source/icons/linuxcrossblender.rcscons deleted file mode 100644 index cf3083aa472..00000000000 --- a/source/icons/linuxcrossblender.rcscons +++ /dev/null @@ -1,2 +0,0 @@ -APPICON ICON "source/icons/winblender.ico"
-BLENDERFILE ICON "source/icons/winblenderfile.ico"
diff --git a/source/icons/winblender.rc b/source/icons/winblender.rc index 77e62111d2d..244c2cb2e2c 100644 --- a/source/icons/winblender.rc +++ b/source/icons/winblender.rc @@ -1,2 +1,40 @@ -APPICON ICON "winblender.ico" -BLENDERFILE ICON "winblenderfile.ico" +#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/winblender.rcscons b/source/icons/winblender.rcscons deleted file mode 100644 index 97579f1ffe0..00000000000 --- a/source/icons/winblender.rcscons +++ /dev/null @@ -1,2 +0,0 @@ -APPICON ICON "source\\icons\\winblender.ico" -BLENDERFILE ICON "source\\icons\\winblenderfile.ico" |