Fix paths for icu
diff --git a/icu.gyp b/icu.gyp
index f55b7e8..df506e1 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -41,8 +41,8 @@
}],
],
'include_dirs': [
- 'src/common',
- 'src/i18n',
+ 'source/common',
+ 'source/i18n',
],
'msvs_disabled_warnings': [4005, 4355, 4996],
},
@@ -88,159 +88,159 @@
'target_name': 'icuuc',
'type': '<(component)',
'sources': [
- 'src/common/bmpset.cpp',
- 'src/common/brkeng.cpp',
- 'src/common/brkiter.cpp',
- 'src/common/bytestream.cpp',
- 'src/common/caniter.cpp',
- 'src/common/chariter.cpp',
- 'src/common/charstr.cpp',
- 'src/common/cmemory.c',
- 'src/common/cstring.c',
- 'src/common/cwchar.c',
- 'src/common/dictbe.cpp',
- 'src/common/dtintrv.cpp',
- 'src/common/errorcode.cpp',
- 'src/common/filterednormalizer2.cpp',
- 'src/common/icudataver.c',
- 'src/common/icuplug.c',
- 'src/common/locavailable.cpp',
- 'src/common/locbased.cpp',
- 'src/common/locdispnames.cpp',
- 'src/common/locid.cpp',
- 'src/common/loclikely.cpp',
- 'src/common/locmap.c',
- 'src/common/locresdata.cpp',
- 'src/common/locutil.cpp',
- 'src/common/mutex.cpp',
- 'src/common/normalizer2.cpp',
- 'src/common/normalizer2impl.cpp',
- 'src/common/normlzr.cpp',
- 'src/common/parsepos.cpp',
- 'src/common/propname.cpp',
- 'src/common/propsvec.c',
- 'src/common/punycode.c',
- 'src/common/putil.c',
- 'src/common/rbbi.cpp',
- 'src/common/rbbidata.cpp',
- 'src/common/rbbinode.cpp',
- 'src/common/rbbirb.cpp',
- 'src/common/rbbiscan.cpp',
- 'src/common/rbbisetb.cpp',
- 'src/common/rbbistbl.cpp',
- 'src/common/rbbitblb.cpp',
- 'src/common/resbund.cpp',
- 'src/common/resbund_cnv.cpp',
- 'src/common/ruleiter.cpp',
- 'src/common/schriter.cpp',
- 'src/common/serv.cpp',
- 'src/common/servlk.cpp',
- 'src/common/servlkf.cpp',
- 'src/common/servls.cpp',
- 'src/common/servnotf.cpp',
- 'src/common/servrbf.cpp',
- 'src/common/servslkf.cpp',
- 'src/common/stringpiece.cpp',
- 'src/common/triedict.cpp',
- 'src/common/uarrsort.c',
- 'src/common/ubidi.c',
- 'src/common/ubidi_props.c',
- 'src/common/ubidiln.c',
- 'src/common/ubidiwrt.c',
- 'src/common/ubrk.cpp',
- 'src/common/ucase.c',
- 'src/common/ucasemap.c',
- 'src/common/ucat.c',
- 'src/common/uchar.c',
- 'src/common/uchriter.cpp',
- 'src/common/ucln_cmn.c',
- 'src/common/ucmndata.c',
- 'src/common/ucnv.c',
- 'src/common/ucnv2022.c',
- 'src/common/ucnv_bld.c',
- 'src/common/ucnv_cb.c',
- 'src/common/ucnv_cnv.c',
- 'src/common/ucnv_err.c',
- 'src/common/ucnv_ext.c',
- 'src/common/ucnv_io.c',
- 'src/common/ucnv_lmb.c',
- 'src/common/ucnv_set.c',
- 'src/common/ucnv_u16.c',
- 'src/common/ucnv_u32.c',
- 'src/common/ucnv_u7.c',
- 'src/common/ucnv_u8.c',
- 'src/common/ucnvbocu.c',
- 'src/common/ucnvdisp.c',
- 'src/common/ucnvhz.c',
- 'src/common/ucnvisci.c',
- 'src/common/ucnvlat1.c',
- 'src/common/ucnvmbcs.c',
- 'src/common/ucnvscsu.c',
- 'src/common/ucnvsel.cpp',
- 'src/common/ucol_swp.cpp',
- 'src/common/udata.cpp',
- 'src/common/udatamem.c',
- 'src/common/udataswp.c',
- 'src/common/uenum.c',
- 'src/common/uhash.c',
- 'src/common/uhash_us.cpp',
- 'src/common/uidna.cpp',
- 'src/common/uinit.c',
- 'src/common/uinvchar.c',
- 'src/common/uiter.cpp',
- 'src/common/ulist.c',
- 'src/common/uloc.c',
- 'src/common/uloc_tag.c',
- 'src/common/umapfile.c',
- 'src/common/umath.c',
- 'src/common/umutex.c',
- 'src/common/unames.c',
- 'src/common/unifilt.cpp',
- 'src/common/unifunct.cpp',
- 'src/common/uniset.cpp',
- 'src/common/uniset_props.cpp',
- 'src/common/unisetspan.cpp',
- 'src/common/unistr.cpp',
- 'src/common/unistr_case.cpp',
- 'src/common/unistr_cnv.cpp',
- 'src/common/unistr_props.cpp',
- 'src/common/unorm.cpp',
- 'src/common/unorm_it.c',
- 'src/common/unormcmp.cpp',
- 'src/common/uobject.cpp',
- 'src/common/uprops.cpp',
- 'src/common/ures_cnv.c',
- 'src/common/uresbund.c',
- 'src/common/uresdata.c',
- 'src/common/usc_impl.c',
- 'src/common/uscript.c',
- 'src/common/uset.cpp',
- 'src/common/uset_props.cpp',
- 'src/common/usetiter.cpp',
- 'src/common/ushape.c',
- 'src/common/usprep.cpp',
- 'src/common/ustack.cpp',
- 'src/common/ustr_cnv.c',
- 'src/common/ustr_wcs.c',
- 'src/common/ustrcase.c',
- 'src/common/ustrenum.cpp',
- 'src/common/ustrfmt.c',
- 'src/common/ustring.c',
- 'src/common/ustrtrns.c',
- 'src/common/utext.cpp',
- 'src/common/utf_impl.c',
- 'src/common/util.cpp',
- 'src/common/util_props.cpp',
- 'src/common/utrace.c',
- 'src/common/utrie.c',
- 'src/common/utrie2.cpp',
- 'src/common/utrie2_builder.c',
- 'src/common/uts46.cpp',
- 'src/common/utypes.c',
- 'src/common/uvector.cpp',
- 'src/common/uvectr32.cpp',
- 'src/common/uvectr64.cpp',
- 'src/common/wintz.c',
+ 'source/common/bmpset.cpp',
+ 'source/common/brkeng.cpp',
+ 'source/common/brkiter.cpp',
+ 'source/common/bytestream.cpp',
+ 'source/common/caniter.cpp',
+ 'source/common/chariter.cpp',
+ 'source/common/charstr.cpp',
+ 'source/common/cmemory.c',
+ 'source/common/cstring.c',
+ 'source/common/cwchar.c',
+ 'source/common/dictbe.cpp',
+ 'source/common/dtintrv.cpp',
+ 'source/common/errorcode.cpp',
+ 'source/common/filterednormalizer2.cpp',
+ 'source/common/icudataver.c',
+ 'source/common/icuplug.c',
+ 'source/common/locavailable.cpp',
+ 'source/common/locbased.cpp',
+ 'source/common/locdispnames.cpp',
+ 'source/common/locid.cpp',
+ 'source/common/loclikely.cpp',
+ 'source/common/locmap.c',
+ 'source/common/locresdata.cpp',
+ 'source/common/locutil.cpp',
+ 'source/common/mutex.cpp',
+ 'source/common/normalizer2.cpp',
+ 'source/common/normalizer2impl.cpp',
+ 'source/common/normlzr.cpp',
+ 'source/common/parsepos.cpp',
+ 'source/common/propname.cpp',
+ 'source/common/propsvec.c',
+ 'source/common/punycode.c',
+ 'source/common/putil.c',
+ 'source/common/rbbi.cpp',
+ 'source/common/rbbidata.cpp',
+ 'source/common/rbbinode.cpp',
+ 'source/common/rbbirb.cpp',
+ 'source/common/rbbiscan.cpp',
+ 'source/common/rbbisetb.cpp',
+ 'source/common/rbbistbl.cpp',
+ 'source/common/rbbitblb.cpp',
+ 'source/common/resbund.cpp',
+ 'source/common/resbund_cnv.cpp',
+ 'source/common/ruleiter.cpp',
+ 'source/common/schriter.cpp',
+ 'source/common/serv.cpp',
+ 'source/common/servlk.cpp',
+ 'source/common/servlkf.cpp',
+ 'source/common/servls.cpp',
+ 'source/common/servnotf.cpp',
+ 'source/common/servrbf.cpp',
+ 'source/common/servslkf.cpp',
+ 'source/common/stringpiece.cpp',
+ 'source/common/triedict.cpp',
+ 'source/common/uarrsort.c',
+ 'source/common/ubidi.c',
+ 'source/common/ubidi_props.c',
+ 'source/common/ubidiln.c',
+ 'source/common/ubidiwrt.c',
+ 'source/common/ubrk.cpp',
+ 'source/common/ucase.c',
+ 'source/common/ucasemap.c',
+ 'source/common/ucat.c',
+ 'source/common/uchar.c',
+ 'source/common/uchriter.cpp',
+ 'source/common/ucln_cmn.c',
+ 'source/common/ucmndata.c',
+ 'source/common/ucnv.c',
+ 'source/common/ucnv2022.c',
+ 'source/common/ucnv_bld.c',
+ 'source/common/ucnv_cb.c',
+ 'source/common/ucnv_cnv.c',
+ 'source/common/ucnv_err.c',
+ 'source/common/ucnv_ext.c',
+ 'source/common/ucnv_io.c',
+ 'source/common/ucnv_lmb.c',
+ 'source/common/ucnv_set.c',
+ 'source/common/ucnv_u16.c',
+ 'source/common/ucnv_u32.c',
+ 'source/common/ucnv_u7.c',
+ 'source/common/ucnv_u8.c',
+ 'source/common/ucnvbocu.c',
+ 'source/common/ucnvdisp.c',
+ 'source/common/ucnvhz.c',
+ 'source/common/ucnvisci.c',
+ 'source/common/ucnvlat1.c',
+ 'source/common/ucnvmbcs.c',
+ 'source/common/ucnvscsu.c',
+ 'source/common/ucnvsel.cpp',
+ 'source/common/ucol_swp.cpp',
+ 'source/common/udata.cpp',
+ 'source/common/udatamem.c',
+ 'source/common/udataswp.c',
+ 'source/common/uenum.c',
+ 'source/common/uhash.c',
+ 'source/common/uhash_us.cpp',
+ 'source/common/uidna.cpp',
+ 'source/common/uinit.c',
+ 'source/common/uinvchar.c',
+ 'source/common/uiter.cpp',
+ 'source/common/ulist.c',
+ 'source/common/uloc.c',
+ 'source/common/uloc_tag.c',
+ 'source/common/umapfile.c',
+ 'source/common/umath.c',
+ 'source/common/umutex.c',
+ 'source/common/unames.c',
+ 'source/common/unifilt.cpp',
+ 'source/common/unifunct.cpp',
+ 'source/common/uniset.cpp',
+ 'source/common/uniset_props.cpp',
+ 'source/common/unisetspan.cpp',
+ 'source/common/unistr.cpp',
+ 'source/common/unistr_case.cpp',
+ 'source/common/unistr_cnv.cpp',
+ 'source/common/unistr_props.cpp',
+ 'source/common/unorm.cpp',
+ 'source/common/unorm_it.c',
+ 'source/common/unormcmp.cpp',
+ 'source/common/uobject.cpp',
+ 'source/common/uprops.cpp',
+ 'source/common/ures_cnv.c',
+ 'source/common/uresbund.c',
+ 'source/common/uresdata.c',
+ 'source/common/usc_impl.c',
+ 'source/common/uscript.c',
+ 'source/common/uset.cpp',
+ 'source/common/uset_props.cpp',
+ 'source/common/usetiter.cpp',
+ 'source/common/ushape.c',
+ 'source/common/usprep.cpp',
+ 'source/common/ustack.cpp',
+ 'source/common/ustr_cnv.c',
+ 'source/common/ustr_wcs.c',
+ 'source/common/ustrcase.c',
+ 'source/common/ustrenum.cpp',
+ 'source/common/ustrfmt.c',
+ 'source/common/ustring.c',
+ 'source/common/ustrtrns.c',
+ 'source/common/utext.cpp',
+ 'source/common/utf_impl.c',
+ 'source/common/util.cpp',
+ 'source/common/util_props.cpp',
+ 'source/common/utrace.c',
+ 'source/common/utrie.c',
+ 'source/common/utrie2.cpp',
+ 'source/common/utrie2_builder.c',
+ 'source/common/uts46.cpp',
+ 'source/common/utypes.c',
+ 'source/common/uvector.cpp',
+ 'source/common/uvectr32.cpp',
+ 'source/common/uvectr64.cpp',
+ 'source/common/wintz.c',
],
'defines': [
'U_COMMON_IMPLEMENTATION',
@@ -250,7 +250,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- 'src/common',
+ 'source/common',
],
'conditions': [
[ 'component=="static_library"', {
