Skip to content

use libnu mason dependency instead vendored src #61

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

Draft
axrj wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

use libnu mason dependency instead vendored src #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"-isystem <(module_root_dir)/mason_packages/.link/include/mbgl/vendor/mapbox-base/deps/geojson.hpp/include",
"-isystem <(module_root_dir)/mason_packages/.link/include/mbgl/vendor/mapbox-base/extras/rapidjson/include",
'-isystem <(module_root_dir)/mason_packages/.link/include/mbgl/vendor/wagyu/include',
"-isystem <(module_root_dir)/mason_packages/.link/include/mbgl/vendor/nunicode/include",
'-isystem <(module_root_dir)/mason_packages/.link/include/mbgl/vendor/boost/include',
"-isystem <(module_root_dir)/mason_packages/.link/src",
"-isystem <(module_root_dir)/mason_packages/.link/platform",
Expand Down Expand Up @@ -81,7 +80,14 @@
# we set protozero_assert to avoid the tests asserting
# since we test they throw instead
'protozero_assert(x)',
'MBGL_USE_BUILTIN_ICU'
'MBGL_USE_BUILTIN_ICU',
'NU_WITH_TOLOWER',
'NU_WITH_TOUPPER',
'NU_WITH_UDB',
'NU_WITH_UNACCENT',
'NU_WITH_UTF8_READER',
'NU_WITH_UTF8_WRITER',
'NU_WITH_Z_COLLATION'
],
'sources': [
'./src/vtshaver.cpp',
Expand All @@ -99,13 +105,6 @@
'./mason_packages/.link/platform/default/src/mbgl/util/utf.cpp',
# mbgl::platform::lowercase and mbgl::platform::upcase
'./mason_packages/.link/platform/default/src/mbgl/util/string_stdlib.cpp',
'./vendor/nunicode/src/libnu/ducet.c',
'./vendor/nunicode/src/libnu/strcoll.c',
'./vendor/nunicode/src/libnu/strings.c',
'./vendor/nunicode/src/libnu/tolower.c',
'./vendor/nunicode/src/libnu/tounaccent.c',
'./vendor/nunicode/src/libnu/toupper.c',
'./vendor/nunicode/src/libnu/utf8.c',
# Bring in mbgl::platform::formatNumber
'./mason_packages/.link/platform/default/src/mbgl/i18n/number_format.cpp',
],
Expand All @@ -118,7 +117,8 @@
# A portable file extension name. Build static lib (.a) then when you're linking,
# you're smooshing it into your lib. Static lib is linked when we build a project, rather than at runtime.
# But Dynamic lib is loaded at runtime. (.node is a type of dynamic lib cause it's loaded into node at runtime)
"<(module_root_dir)/mason_packages/.link/lib/libmbgl-core.a"
"<(module_root_dir)/mason_packages/.link/lib/libmbgl-core.a",
"<(module_root_dir)/mason_packages/.link/lib/libnu.a"
],
'conditions': [
['error_on_warnings == "true"', {
Expand All @@ -139,9 +139,6 @@
'OTHER_LDFLAGS':[
'-framework Foundation'
],
'OTHER_CFLAGS': [
"-isystem <(module_root_dir)/vendor/nunicode/include"
],
'OTHER_CPLUSPLUSFLAGS': [
'<@(system_includes)',
'<@(compiler_checks)'
Expand Down
1 change: 1 addition & 0 deletions mason-versions.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ clang-format=10.0.0
llvm-cov=10.0.0
binutils=2.31
mbgl-core=1.6.0-cxx11abi
nunicode=1.8
19 changes: 0 additions & 19 deletions vendor/nunicode/LICENSE
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/nunicode/files.txt
View file
Open in desktop

This file was deleted.

140 changes: 0 additions & 140 deletions vendor/nunicode/include/libnu/casemap.h
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/nunicode/include/libnu/casemap_internal.h
View file
Open in desktop

This file was deleted.

Loading