File tree Expand file tree Collapse file tree 1 file changed +14
-15
lines changed Expand file tree Collapse file tree 1 file changed +14
-15
lines changed Original file line number Diff line number Diff line change 71
71
}, {
72
72
'toolsets' : ['host' , 'target' ],
73
73
}],
74
- [ 'OS == "win"' , {
74
+ [ 'OS == "win" and icu_use_data_file_flag==0 ' , {
75
75
'type' : 'none' ,
76
76
'copies' : [
77
77
{
82
82
},
83
83
],
84
84
}],
85
- [ 'OS != "win" and icu_use_data_file_flag' , {
85
+ [ 'icu_use_data_file_flag' , {
86
86
# Remove any assembly data file.
87
87
'sources/' : [['exclude' , 'icudt46l_dat' ]],
88
88
# Compile in the stub data symbol.
89
89
'sources' : ['source/stubdata/stubdata.c' ],
90
+
90
91
# Make sure any binary depending on this gets the data file.
91
- 'link_settings' : {
92
- 'target_conditions' : [
93
- ['(OS == "mac" and _mac_bundle) or OS=="ios"' , {
94
- 'mac_bundle_resources' : [
92
+ 'conditions' : [
93
+ ['OS=="ios"' , {
94
+ 'mac_bundle_resources' : [
95
+ 'source/data/in/icudt46l.dat' ,
96
+ ],
97
+ }, {
98
+ 'copies' : [{
99
+ 'destination' : '<(PRODUCT_DIR)' ,
100
+ 'files' : [
95
101
'source/data/in/icudt46l.dat' ,
96
102
],
97
- }, {
98
- 'copies' : [{
99
- 'destination' : '<(PRODUCT_DIR)' ,
100
- 'files' : [
101
- 'source/data/in/icudt46l.dat' ,
102
- ],
103
- }],
104
103
}],
105
- ], # target_conditions
106
- } , # link_settings
104
+ }],
105
+ ] , # target_condition
107
106
}],
108
107
],
109
108
'target_conditions' : [
You can’t perform that action at this time.
0 commit comments