[build] Upgrade GLFW to 3.2.1, SQLite to 3.14.2 and libwebp to 0.5.1

This commit is contained in:
Konstantin Käfer
2016-09-19 12:32:17 +02:00
parent d169ea55c1
commit 1014a503a2
5 changed files with 9 additions and 7 deletions

View File

@@ -6,7 +6,7 @@ mason_use(libjpeg-turbo VERSION 1.4.2)
mason_use(libpng VERSION 1.6.20)
mason_use(libzip VERSION 0.11.2)
mason_use(nunicode VERSION 1.6)
mason_use(sqlite VERSION 3.9.1)
mason_use(sqlite VERSION 3.14.2)
macro(mbgl_platform_core)

View File

@@ -1,11 +1,11 @@
mason_use(glfw VERSION 3.1.2)
mason_use(glfw VERSION 3.2.1)
mason_use(boost_libprogram_options VERSION 1.60.0)
mason_use(sqlite VERSION 3.9.1)
mason_use(sqlite VERSION 3.14.2)
mason_use(libuv VERSION 1.7.5)
mason_use(nunicode VERSION 1.6)
mason_use(libpng VERSION 1.6.20)
mason_use(libjpeg-turbo VERSION 1.4.2)
mason_use(webp VERSION 0.5.0)
mason_use(webp VERSION 0.5.1)
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
include(cmake/loop-uv.cmake)

View File

@@ -1,6 +1,6 @@
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
mason_use(glfw VERSION 3.1.2)
mason_use(glfw VERSION 3.2.1)
mason_use(boost_libprogram_options VERSION 1.60.0)
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
@@ -57,6 +57,7 @@ endmacro()
macro(mbgl_platform_glfw)
target_link_libraries(mbgl-glfw
PRIVATE mbgl-loop
PRIVATE "-framework OpenGL"
PRIVATE "-lsqlite3"
)
endmacro()

View File

@@ -29,6 +29,7 @@ workflows:
- content: |-
#!/bin/bash
set -eu -o pipefail
sudo chown -R $USER /usr/local
brew install cmake
brew install qt5
brew link qt5 --force

View File

@@ -1,12 +1,12 @@
include(platform/qt/qt.cmake)
mason_use(sqlite VERSION 3.9.1)
mason_use(sqlite VERSION 3.14.2)
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
if(NOT WITH_QT_DECODERS)
mason_use(libjpeg-turbo VERSION 1.4.2)
mason_use(libpng VERSION 1.6.20)
mason_use(webp VERSION 0.5.0)
mason_use(webp VERSION 0.5.1)
endif()
macro(mbgl_platform_core)