Merge pull request #1748 from dob205/master

Adding the new icons for 86Box on Windows
This commit is contained in:
Miran Grča
2021-10-15 15:22:14 +02:00
committed by GitHub
5 changed files with 11 additions and 4 deletions

View File

@@ -825,12 +825,19 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
// defining the icons depending on the build status
#ifdef RELEASE_BUILD
/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */
10 ICON DISCARDABLE ICON_PATH "icons/86Box-RB.ico"
/* Icon by OBattler and laciba96 (green for release builds)*/
10 ICON DISCARDABLE ICON_PATH "icons/86Box-green.ico"
#elif BETA_BUILD
/* Icon by OBattler and laciba96 (yellow for beta builds done by Jenkins)*/
10 ICON DISCARDABLE ICON_PATH "icons/86Box-yellow.ico"
#elif ALPHA_BUILD
/* Icon by OBattler and laciba96 (red for alpha builds done by Jenkins)*/
10 ICON DISCARDABLE ICON_PATH "icons/86Box-red.ico"
#else
/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */
10 ICON DISCARDABLE ICON_PATH "icons/86Box.ico"
/* Icon by OBattler and laciba96 (gray for builds of branches and from the git master)*/
10 ICON DISCARDABLE ICON_PATH "icons/86Box-gray.ico"
#endif
16 ICON DISCARDABLE ICON_PATH "icons/floppy_525.ico"
17 ICON DISCARDABLE ICON_PATH "icons/floppy_525_active.ico"

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

BIN
src/win/icons/86Box-red.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB