tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ios build system fixes

Browse Source 
[skip ci]
This commit is contained in:
Konstantin Käfer
2014-10-21 11:41:30 +02:00
parent 1da471abba
commit 9103d84ace
3 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -6,14 +6,11 @@ all: setup
setup: config.gypi
config.gypi:
./setup-libraries.sh
xlibs:
@./mapnik-packaging/osx/darwin_configure.sh osx
ilibs:
@./mapnik-packaging/osx/darwin_configure.sh ios
MASON_PLATFORM=ios ./configure
# Builds the regular library
mbgl: config.gypi mapboxgl.gyp node
@@ -84,7 +81,7 @@ xproj: xproj-cli
open ./build/macosx/mapboxgl-app.xcodeproj
# build iOS project for Xcode
iproj-cli: config.gypi ilibs ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache node
iproj-cli: ilibs config.gypi ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache node
deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
iproj: iproj-cli

75
configure vendored
View File

@@ -12,11 +12,21 @@ LIBPNG_VERSION=1.6.13
SQLITE_VERSION=system
LIBUV_VERSION=0.10.28
mason install libcurl ${LIBCURL_VERSION}
mason install glfw ${GLFW_VERSION}
mason install libpng ${LIBPNG_VERSION}
mason install sqlite ${SQLITE_VERSION}
mason install libuv ${LIBUV_VERSION}
case $MASON_PLATFORM in
'ios')
SQLITE_VERSION=system
LIBPNG_VERSION=1.6.13
LIBUV_VERSION=0.10.28
;;
*)
GLFW_VERSION=a21f2377
SQLITE_VERSION=system
LIBPNG_VERSION=system
LIBCURL_VERSION=system
LIBUV_VERSION=0.10.28
;;
esac
BOOST_ROOT=/usr
if [ -d '/usr/local/boost' ]; then BOOST_ROOT='/usr/local' ; fi
@@ -25,7 +35,9 @@ function quote_flags {
python -c "import sys, re; print re.split('(?<!-framework)\s+', ' '.join(sys.argv[1:]))" "$@"
}
echo "# Do not edit. Generated by the configure script.
LN=$'\n'
CONFIG="# Do not edit. Generated by the configure script.
{
'target_defaults': {
'cflags': [],
@@ -38,18 +50,43 @@ echo "# Do not edit. Generated by the configure script.
'node': '$(which node)',
'npm': '$(which npm)',
'python': '$(which python)',
'boost_root': '/usr/local',
'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),
'curl_libraries': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),
'glfw3_cflags': $(quote_flags $(mason cflags glfw ${GLFW_VERSION})),
'glfw3_libraries': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),
'png_cflags': $(quote_flags $(mason cflags libpng ${LIBPNG_VERSION})),
'png_libraries': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),
'sqlite3_cflags': $(quote_flags $(mason cflags sqlite ${SQLITE_VERSION})),
'sqlite3_libraries': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),
'uv_cflags': $(quote_flags $(mason cflags libuv ${LIBUV_VERSION})),
'uv_libraries': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),
}
}" > config.gypi
'boost_root': '${BOOST_ROOT}',
"
if [ ! -z ${LIBCURL_VERSION} ]; then
mason install libcurl ${LIBCURL_VERSION}
CONFIG+=$" 'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),"$LN
CONFIG+=$" 'curl_libraries': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),"$LN
fi
if [ ! -z ${GLFW_VERSION} ]; then
mason install glfw ${GLFW_VERSION}
CONFIG+=$" 'glfw3_cflags': $(quote_flags $(mason cflags glfw ${GLFW_VERSION})),"$LN
CONFIG+=$" 'glfw3_libraries': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),"$LN
fi
if [ ! -z ${LIBPNG_VERSION} ]; then
mason install libpng ${LIBPNG_VERSION}
CONFIG+=$" 'png_cflags': $(quote_flags $(mason cflags libpng ${LIBPNG_VERSION})),"$LN
CONFIG+=$" 'png_libraries': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),"$LN
fi
if [ ! -z ${SQLITE_VERSION} ]; then
mason install sqlite ${SQLITE_VERSION}
CONFIG+=$" 'sqlite3_cflags': $(quote_flags $(mason cflags sqlite ${SQLITE_VERSION})),"$LN
CONFIG+=$" 'sqlite3_libraries': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),"$LN
fi
if [ ! -z ${LIBUV_VERSION} ]; then
mason install libuv ${LIBUV_VERSION}
CONFIG+=$" 'uv_cflags': $(quote_flags $(mason cflags libuv ${LIBUV_VERSION})),"$LN
CONFIG+=$" 'uv_libraries': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),"$LN
fi
CONFIG+=" }
}
"
echo "${CONFIG}" > config.gypi
cat config.gypi

5
src/util/uv-messenger.c
View File

@@ -8,7 +8,12 @@ typedef struct {
void *queue[2];
} uv__messenger_item_t;
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
void uv__messenger_callback(uv_async_t *async, int) {
#else
void uv__messenger_callback(uv_async_t *async) {
#endif
uv_messenger_t *msgr = (uv_messenger_t *)async->data;
uv__messenger_item_t *item;