Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts: README.md
This commit is contained in:
@@ -102,6 +102,8 @@ Then, you can then proceed to build the library like:
|
||||
Or proceed to building the debug application with:
|
||||
|
||||
make linux
|
||||
|
||||
Be sure to setup an access token per below before running `build/Release/mapbox-gl`.
|
||||
|
||||
## Android (on Linux)
|
||||
|
||||
@@ -152,7 +154,7 @@ Run:
|
||||
|
||||
make android
|
||||
|
||||
You can then open `android/java` in Android Studio.
|
||||
You can then open `android/java` in Android Studio.
|
||||
|
||||
# Troubleshooting
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
'xcode_settings': {
|
||||
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
|
||||
'OTHER_CFLAGS': [ '<@(cflags)' ],
|
||||
'SKIP_INSTALL': 'YES'
|
||||
},
|
||||
}, {
|
||||
'cflags_cc': [ '<@(cflags_cc)' ],
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
|
||||
'CLANG_ENABLE_OBJC_ARC': 'YES',
|
||||
'CODE_SIGN_IDENTITY': 'iPhone Developer',
|
||||
'SKIP_INSTALL': 'YES'
|
||||
},
|
||||
'configurations': {
|
||||
'Release': {
|
||||
|
||||
Reference in New Issue
Block a user