Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to newer ICU binaries (5.7) #668

Merged
merged 3 commits into from
Jul 22, 2016
Merged

Update to newer ICU binaries (5.7) #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a6512b
[Breaking Change] Update to newer ICU binaries (5.7)
ms-jihua Jul 19, 2016
81b8a5c
Add support in CFCalendar for new ICU behavior
ms-jihua Jul 22, 2016
d4ef6c0
Removed excessive comments
ms-jihua Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 0 additions & 21 deletions Frameworks/CoreFoundation/Base.subproj/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,6 @@ __kCFReleaseEvent = 29
#include <malloc/malloc.h>
#endif

// WINOBJC: add in ICU deps so that we can initialize ICU with correct data when we
// initialize CoreFoundation. Really this should be in the "normal" loading path but
// that requires rebuilding ICU.
#include <unicode/coll.h>
#include <unicode/ucnv.h>
#include <unicode/brkiter.h>
#include <unicode/uclean.h>
#include <unicode/udata.h>
#include <assert.h>
extern "C" {
extern const char _static_icuData[];
};


#define FAKE_INSTRUMENTS 0

#define CF_IS_SWIFT(type,obj) false
Expand Down Expand Up @@ -1323,13 +1309,6 @@ void __CFInitialize(void) {
// CFLog(kCFLogLevelWarning, CFSTR("Assertions enabled"));
#endif

// WINOBJC: add in ICU deps so that we can initialize ICU with correct data when we
// initialize CoreFoundation. Really this should be in the "normal" loading path but
// that requires rebuilding ICU.
UErrorCode status = U_ZERO_ERROR;
udata_setCommonData(_static_icuData, &status);
assert(status == U_ZERO_ERROR);

__CFProphylacticAutofsAccess = false;

__CFInitializing = 0;
Expand Down
11 changes: 9 additions & 2 deletions Frameworks/CoreFoundation/Locale.subproj/CFCalendar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,19 @@ Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRang
if (!calendar->_cal) {
return false;
}

// WINOBJC: WinObjC's ICU returns UCAL_WEEKDAY and UCAL_WEEKEND with no onset or cease
// Add calculations for onset or cease using weekday and weekend
for (CFIndex i = 0; i < 7; i++) {
UErrorCode status = U_ZERO_ERROR;
weekdayTypes[i] = ucal_getDayOfWeekType(calendar->_cal, (UCalendarDaysOfWeek)weekdaysIndex[i], &status);
if (weekdayTypes[i] == UCAL_WEEKEND_ONSET) {
}
for (CFIndex i = 0; i < 7; i++) {
if ((weekdayTypes[i] == UCAL_WEEKEND_ONSET) ||
(weekdayTypes[i] == UCAL_WEEKEND && weekdayTypes[(i - 1) % 7] == UCAL_WEEKDAY)) {
onset = weekdaysIndex[i];
} else if (weekdayTypes[i] == UCAL_WEEKEND_CEASE) {
} else if ((weekdayTypes[i] == UCAL_WEEKEND_CEASE) ||
(weekdayTypes[i] == UCAL_WEEKEND && weekdayTypes[(i + 1) % 7] == UCAL_WEEKDAY)) {
cease = weekdaysIndex[i];
}
}
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/CoreFoundation/Locale.subproj/CFDateFormatter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,7 +1993,7 @@ CFTypeRef CFDateFormatterCopyProperty(CFDateFormatterRef formatter, CFStringRef
return formatter->_property._UsesCharacterDirection ? CFRetain(formatter->_property._UsesCharacterDirection) : CFRetain(kCFBooleanFalse);
} else if (CFEqual(key, kCFDateFormatterFormattingContextKey)) {
if (formatter->_property._FormattingContext) return CFRetain(formatter->_property._FormattingContext);
int value = 0; // __cficu_udat_getContext(formatter->_df, UDISPCTX_TYPE_CAPITALIZATION, &status); // HACKHACK: don't have this symbol in our ICU version.
int value = __cficu_udat_getContext(formatter->_df, UDISPCTX_TYPE_CAPITALIZATION, &status);
return CFNumberCreate(CFGetAllocator(formatter), kCFNumberIntType, (const void *)&value);
} else {
CFAssert3(0, __kCFLogAssertion, "%s(): unknown key %p (%@)", __PRETTY_FUNCTION__, key, key);
Expand Down
6 changes: 5 additions & 1 deletion Frameworks/CoreFoundation/Locale.subproj/CFNumberFormatter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,11 @@ void CFNumberFormatterSetProperty(CFNumberFormatterRef formatter, CFStringRef ke
#if U_ICU_VERSION_MAJOR_NUM >= 55
__CFGenericValidateType(value, CFNumberGetTypeID());
CFNumberGetValue((CFNumberRef)value, kCFNumberSInt32Type, &n);
__cficu_unum_setContext(formatter->_nf, n, &status);

// WINOBJC: WinObjC seems to have stricter type-checking than the reference platform,
// so an explicit cast is required here
// __cficu_unum_setContext(formatter->_nf, n, &status);
__cficu_unum_setContext(formatter->_nf, (UDisplayContext)n, &status);
Copy link
Member

@bbowman bbowman Jul 19, 2016 •
edited by ms-jihua
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UDisplayContext [](start = 49, length = 15)

static cast? // WINOBJC comment? #Pending

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's not static cast, this is a C file and upstreamable.

In reply to: 71390074 [](ancestors = 71390074)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// WINOBJC: WinObjC seems to have stricter type-checking than the reference platform,
// so an explicit cast is required here

In reply to: 71390930 [](ancestors = 71390930,71390074)

#endif
}
if (kCFNumberFormatterSpellOutStyle == formatter->_style && kCFNumberFormatterIsLenientKey != key) return;
Expand Down
20 changes: 10 additions & 10 deletions Frameworks/Foundation/NSTimeZone.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ + (NSTimeZone*)_getSystemTZ {
if (!U_FAILURE(status)) {
const UnicodeString* zoneId = timeZoneIds->snext(status);
if (!U_FAILURE(status)) {
systemTimeZone->_icuTZ = icu_48::TimeZone::createTimeZone(*zoneId);
systemTimeZone->_icuTZ = icu::TimeZone::createTimeZone(*zoneId);
gotICUTimeZone = YES;
}
}
Expand Down Expand Up @@ -232,7 +232,7 @@ + (NSString*)timeZoneDataVersion {
*/
+ (instancetype)timeZoneForSecondsFromGMT:(NSInteger)seconds {
NSTimeZone* ret = [self alloc];
ret->_icuTZ = icu_48::TimeZone::createTimeZone(icu_48::UnicodeString("GMT"));
ret->_icuTZ = icu::TimeZone::createTimeZone(icu::UnicodeString("GMT"));
ret->_icuTZ->setRawOffset(seconds * 1000);
return [ret autorelease];
}
Expand All @@ -249,7 +249,7 @@ + (instancetype)localTimeZone {

+ (instancetype)_gmtTimeZone {
NSTimeZone* ret = [self alloc];
ret->_icuTZ = icu_48::TimeZone::getGMT()->clone();
ret->_icuTZ = icu::TimeZone::getGMT()->clone();
return [ret autorelease];
}

Expand All @@ -258,7 +258,7 @@ + (instancetype)_gmtTimeZone {
*/
+ (instancetype)timeZoneWithName:(NSString*)name {
NSTimeZone* ret = [self alloc];
ret->_icuTZ = icu_48::TimeZone::createTimeZone(icu_48::UnicodeString([name UTF8String]));
ret->_icuTZ = icu::TimeZone::createTimeZone(icu::UnicodeString([name UTF8String]));
return [ret autorelease];
}

Expand Down Expand Up @@ -323,8 +323,8 @@ + (void)_setDefaultAbbreviationDictionary {

while (abbreviation != NULL && status == U_ZERO_ERROR) {
icu::TimeZone* timeZone = icu::TimeZone::createTimeZone(*abbreviation);
icu_48::UnicodeString name;
icu_48::UnicodeString id;
icu::UnicodeString name;
icu::UnicodeString id;

timeZone->getDisplayName(name);
timeZone->getID(id);
Expand Down Expand Up @@ -364,7 +364,7 @@ + (NSTimeZone*)timeZoneWithName:(NSString*)name data:(NSData*)data {
*/
- (instancetype)initWithName:(NSString*)name {
if (self = [self init]) {
self->_icuTZ = icu_48::TimeZone::createTimeZone(icu_48::UnicodeString([name UTF8String]));
self->_icuTZ = icu::TimeZone::createTimeZone(icu::UnicodeString([name UTF8String]));
}
return self;
}
Expand Down Expand Up @@ -420,7 +420,7 @@ - (NSDate*)nextDaylightSavingTimeTransitionAfterDate:(NSDate*)date {
@Status Interoperable
*/
- (NSString*)name {
icu_48::UnicodeString n;
icu::UnicodeString n;
_icuTZ->getID(n);
std::string realStr;
n.toUTF8String(realStr);
Expand All @@ -432,7 +432,7 @@ - (NSString*)name {
@Notes Displays correct abbreviation but with slightly incorrect formatting on the offset. GMT-07:00 vs GMT-7
*/
- (NSString*)abbreviation {
icu_48::UnicodeString n;
icu::UnicodeString n;
UBool useDaylight = [self isDaylightSavingTime];
_icuTZ->getDisplayName(useDaylight, icu::TimeZone::EDisplayType::SHORT, n);
std::string realStr;
Expand All @@ -457,7 +457,7 @@ - (NSString*)localizedName:(NSTimeZoneNameStyle)style locale:(NSLocale*)locale {
NSString* identifier = [locale localeIdentifier];
icu::Locale icuLocale = icu::Locale::createFromName([identifier UTF8String]);

icu_48::UnicodeString ret;
icu::UnicodeString ret;

_icuTZ->getDisplayName(daylight, type, icuLocale, ret);

Expand Down
8 changes: 4 additions & 4 deletions build/CoreFoundation/dll/CoreFoundation.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<ModuleDefinitionFile>CoreFoundation.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
Expand All @@ -152,7 +152,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<ModuleDefinitionFile>CoreFoundation.def</ModuleDefinitionFile>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
Copy link
Member

@bbowman bbowman Jul 19, 2016 •
edited by ms-jihua
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

icudata.lib [](start = 100, length = 11)

hooray!! Any numbers on the reduced dll size? #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CoreFoundation.dll 18.8mb -> 0.9mb

In reply to: 71389811 [](ancestors = 71389811)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

icudt.dll 7 kb -> 25mb

In reply to: 71421042 [](ancestors = 71421042,71389811)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Net increase in size, probably because more complete data set now?

In reply to: 71421348 [](ancestors = 71421348,71421042,71389811)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think that'd be the case. Also reminder to everyone that eventually we'll consume this directly from windows, meaning we'll no longer take the hit.

In reply to: 71459710 [](ancestors = 71459710,71421348,71421042,71389811)

<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
Expand Down Expand Up @@ -181,7 +181,7 @@
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<ModuleDefinitionFile>CoreFoundation.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
Expand All @@ -208,7 +208,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<ModuleDefinitionFile>CoreFoundation.def</ModuleDefinitionFile>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
Expand Down
8 changes: 4 additions & 4 deletions build/Foundation/dll/Foundation.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>Foundation.def</ModuleDefinitionFile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
Expand All @@ -72,7 +72,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>Foundation.def</ModuleDefinitionFile>
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
Expand All @@ -90,7 +90,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>Foundation.def</ModuleDefinitionFile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
Expand All @@ -106,7 +106,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
</ClCompile>
<Link>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>windowsapp.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>Foundation.def</ModuleDefinitionFile>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
Expand Down
8 changes: 4 additions & 4 deletions build/Tests/UnitTests/CoreFoundation/CoreFoundation.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down Expand Up @@ -158,7 +158,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand All @@ -182,7 +182,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down Expand Up @@ -210,7 +210,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(StarboardBasePath)\Frameworks\limbo;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down
8 changes: 4 additions & 4 deletions build/Tests/UnitTests/Foundation/Foundation.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand All @@ -162,7 +162,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down Expand Up @@ -193,7 +193,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down Expand Up @@ -224,7 +224,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;icudata_arm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>mincore.lib;libxml2.lib;icudt.lib;icuin.lib;icuuc.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AppContainer>false</AppContainer>
<AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
Expand Down
Loading