Chameleon

Chameleon Commit Details

Date:2016-06-18 12:36:50 (4 years 5 months ago)
Author:ErmaC
Commit:2832
Parents: 2831
Message:Add Sierra GUI icons detection. (gui.c)
Changes:
M/trunk/i386/boot2/gui.c
M/trunk/i386/boot2/boot.h
M/trunk/i386/util/boot1-install/Makefile

File differences

trunk/i386/boot2/boot.h
3030
3131
3232
33
3334
3435
3536
#include "libsaio.h"
// OS X Versions
#define SIERRA checkOSVersion("10.12") // Sierra
#define ELCAPITAN checkOSVersion("10.11") // El Capitan
#define YOSEMITE checkOSVersion("10.10") // Yosemite
#define MAVERICKS checkOSVersion("10.9") // Mavericks
trunk/i386/boot2/gui.c
5454
5555
5656
57
57
58
5859
5960
6061
......
7475
7576
7677
78
79
7780
7881
7982
......
9497
9598
9699
100
101
102
103
104
105
106
107
108
109
110
111
112
97113
98114
99115
......
149165
150166
151167
152
168
169
153170
154171
155172
......
169186
170187
171188
189
190
172191
173192
174193
......
189208
190209
191210
211
212
213
214
215
216
217
218
219
220
221
222
223
192224
193225
194226
......
397429
398430
399431
432
433
400434
401435
402436
......
416450
417451
418452
453
454
419455
420456
421457
......
10881124
10891125
10901126
1127
1128
1129
1130
10911131
10921132
10931133
iDeviceGeneric_o,
iDeviceHFS,
iDeviceHFS_o,
iDeviceHFS_sie,
iDeviceHFS_sie_o,
iDeviceHFS_cap,
iDeviceHFS_cap_o,
iDeviceHFS_yos,
iDeviceHFSRAID,
iDeviceHFSRAID_o,
iDeviceHFSRAID_sie,
iDeviceHFSRAID_sie_o,
iDeviceHFSRAID_cap,
iDeviceHFSRAID_cap_o,
iDeviceHFSRAID_yos,
iDeviceHFSRECOVERY,
iDeviceHFSRECOVERY_o,
iDeviceHFSFUSION,
iDeviceHFSFUSION_o,
iDeviceHFSFUSION_sie,
iDeviceHFSFUSION_sie_o,
iDeviceHFSFUSION_cap,
iDeviceHFSFUSION_cap_o,
iDeviceHFSFUSION_yos,
iDeviceHFSFUSION_yos_o,
iDeviceHFSFUSION_mav,
iDeviceHFSFUSION_mav_o,
iDeviceHFSFUSION_ML,
iDeviceHFSFUSION_ML_o,
iDeviceEXT3,
iDeviceEXT3_o,
iDeviceFreeBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */
{.name = "device_generic_o", .image = NULL},
{.name = "device_hfsplus", .image = NULL},
{.name = "device_hfsplus_o", .image = NULL},
{.name = "device_hfsplus_sie", .image = NULL},
{.name = "device_hfsplus_sie_o", .image = NULL},
{.name = "device_hfsplus_cap", .image = NULL},
{.name = "device_hfsplus_cap_o", .image = NULL},
{.name = "device_hfsplus_yos", .image = NULL},
{.name = "device_hfsraid", .image = NULL},
{.name = "device_hfsraid_o", .image = NULL},
{.name = "device_hfsraid_sie", .image = NULL},
{.name = "device_hfsraid_sie_o", .image = NULL},
{.name = "device_hfsraid_cap", .image = NULL},
{.name = "device_hfsraid_cap_o", .image = NULL},
{.name = "device_hfsraid_yos", .image = NULL},
{.name = "device_hfsplus_recovery", .image = NULL},
{.name = "device_hfsplus_recovery_o", .image = NULL},
{.name = "device_hfsfusion", .image = NULL},
{.name = "device_hfsfusion_o", .image = NULL},
{.name = "device_hfsfusion_sie", .image = NULL},
{.name = "device_hfsfusion_sie_o", .image = NULL},
{.name = "device_hfsfusion_cap", .image = NULL},
{.name = "device_hfsfusion_cap_o", .image = NULL},
{.name = "device_hfsfusion_yos", .image = NULL},
{.name = "device_hfsfusion_yos_o", .image = NULL},
{.name = "device_hfsfusion_mav", .image = NULL},
{.name = "device_hfsfusion_mav_o", .image = NULL},
{.name = "device_hfsfusion_ml", .image = NULL},
{.name = "device_hfsfusion_ml_o", .image = NULL},
{.name = "device_ext3", .image = NULL},
{.name = "device_ext3_o", .image = NULL},
{.name = "device_freebsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */
LOADPNG(device_hfsplus, iDeviceGeneric);
LOADPNG(device_hfsplus_o, iDeviceHFS);
LOADPNG(device_hfsplus_sie, iDeviceHFS);
LOADPNG(device_hfsplus_sie_o, iDeviceHFS_sie);
LOADPNG(device_hfsplus_cap, iDeviceHFS);
LOADPNG(device_hfsplus_cap_o, iDeviceHFS_cap);
LOADPNG(device_hfsplus_yos, iDeviceHFS);
LOADPNG(device_hfsraid, iDeviceHFS);
LOADPNG(device_hfsraid_o, iDeviceHFSRAID);
LOADPNG(device_hfsraid_sie, iDeviceHFSRAID);
LOADPNG(device_hfsraid_sie_o, iDeviceHFSRAID_sie);
LOADPNG(device_hfsraid_cap, iDeviceHFSRAID);
LOADPNG(device_hfsraid_cap_o, iDeviceHFSRAID_cap);
LOADPNG(device_hfsraid_yos, iDeviceHFSRAID);
devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_cap : iDeviceHFS_cap); // El Capitan
break;
}
if (device->OSVersion[4] == '2') { // 10.12
devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_sie : iDeviceHFS_sie); // Sierra
break;
}
default:
devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS);
break;
trunk/i386/util/boot1-install/Makefile
1818
1919
2020
21
21
22
2223
2324
2425
......
5758
5859
5960
60
61
-Wl,-no_function_starts \
-Wl,-no_data_in_code_info \
-Wl,-no_version_load_command \
-Wl,-no_uuid
-Wl,-no_uuid \
-Wl,-no_dependent_dr_info
CFLAGS := $(CFLAGS) -mmacosx-version-min=10.5
clean-local:
@for o in $(OBJS); do if [ -f "$${o}" ];then echo "[RM] $${o}"; fi; done
@for p in $(SYMPROG); do if [ -f "$${p}" ];then echo "[RM] $${p}"; fi; done
@rm -f $(SYMPROG) $(OBJS)
@rm -f $(SYMPROG) $(OBJS)

Archive Download the corresponding diff file

Revision: 2832