Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Switch to earcut #2444

Merged
merged 7 commits into from
May 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -423,36 +423,6 @@ appreciated.

===========================================================================

Mapbox GL uses portions of libtess2.

SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
Copyright (C) [dates of first publication] Silicon Graphics, Inc.
All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice including the dates of first publication and either this
permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
be used in advertising or otherwise to promote the sale, use or other dealings in
this Software without prior written authorization from Silicon Graphics, Inc.

===========================================================================

Mapbox GL uses portions of libuv.

libuv is part of the Node project: http://nodejs.org/
Expand Down
1 change: 1 addition & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ print_flags gtest static_libs cflags ldflags
print_flags pixelmatch static_libs cflags ldflags
print_flags webp static_libs cflags ldflags
print_flags jni.hpp static_libs cflags ldflags
print_flags earcut static_libs cflags ldflags

CONFIG+=" }
}
Expand Down
1 change: 1 addition & 0 deletions mbgl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
'<@(geojsonvt_cflags)',
'<@(rapidjson_cflags)',
'<@(variant_cflags)',
'<@(earcut_cflags)',
],
'cflags': [
'<@(opengl_cflags)',
Expand Down
1 change: 1 addition & 0 deletions platform/android/scripts/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ GEOJSONVT_VERSION=4.1.2
VARIANT_VERSION=1.1.0
RAPIDJSON_VERSION=1.0.2
JNI_HPP_VERSION=2.0.0
EARCUT_VERSION=0.11

export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION}
1 change: 1 addition & 0 deletions platform/ios/scripts/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ VARIANT_VERSION=1.1.0
RAPIDJSON_VERSION=1.0.2
GTEST_VERSION=1.7.0
PIXELMATCH_VERSION=0.9.0
EARCUT_VERSION=0.11
1 change: 1 addition & 0 deletions platform/linux/scripts/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RAPIDJSON_VERSION=1.0.2
GTEST_VERSION=1.7.0${CXX11ABI:-}
PIXELMATCH_VERSION=0.9.0
WEBP_VERSION=0.5.0
EARCUT_VERSION=0.11

function print_opengl_flags {
CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN
Expand Down
1 change: 1 addition & 0 deletions platform/osx/scripts/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ VARIANT_VERSION=1.1.0
RAPIDJSON_VERSION=1.0.2
GTEST_VERSION=1.7.0
PIXELMATCH_VERSION=0.9.0
EARCUT_VERSION=0.11
1 change: 1 addition & 0 deletions platform/qt/scripts/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ SQLITE_VERSION=3.9.1
VARIANT_VERSION=1.1.0
ZLIB_VERSION=system
WEBP_VERSION=0.5.0
EARCUT_VERSION=0.11

function print_default_flags {
CONFIG+=" 'cflags': $(quote_flags -fvisibility=hidden),"$LN
Expand Down
Loading