diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-24 22:40:07 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-24 22:40:07 -0400 |
| commit | 11f90812747270de595bc624dedde86f377bb535 (patch) | |
| tree | fecd6e4ddfe48889af85dd7e2de164fcd8307fd6 | |
| parent | 3dec4933a9525b74c06d739adc4fdd9050b3f25f (diff) | |
| parent | 92d00347a87eee10b961d4a1836c1dd6e1df6ba7 (diff) | |
| download | qtlocation-mapboxgl-11f90812747270de595bc624dedde86f377bb535.tar.gz | |
Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown
Conflicts:
common/headless_view.cpp
| -rw-r--r-- | common/headless_view.cpp | 11 | ||||
| -rwxr-xr-x | setup-libraries.sh | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp index d3c6491d0d..37982e6891 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -2,7 +2,6 @@ #include <mbgl/util/timer.hpp> #include <stdexcept> -#include <iostream> namespace mbgl { @@ -158,11 +157,6 @@ HeadlessView::~HeadlessView() { #endif #if MBGL_USE_GLX - std::cerr << "~HeadlessView()" << '\n'; - std::cerr << "x_display: " << x_display << '\n'; - std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; - std::cerr << "gl_context: " << gl_context << '\n'; - glXDestroyContext(x_display, gl_context); XFree(x_info); XCloseDisplay(x_display); @@ -182,11 +176,6 @@ void HeadlessView::make_active() { #endif #if MBGL_USE_GLX - std::cerr << "make_active()" << '\n'; - std::cerr << "x_display: " << x_display << '\n'; - std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; - std::cerr << "gl_context: " << gl_context << '\n'; - if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) { fprintf(stderr, "Switching OpenGL context failed\n"); } diff --git a/setup-libraries.sh b/setup-libraries.sh index 7947efe494..791db81a8a 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,7 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="c0fc970e52950a6f16e3172f1114e5a4ae1e0aa9" +MP_HASH="e82e6c00ea5a0cda147e4c121a3c7751cae69ff8" DIR_HASH=$(echo `pwd` | git hash-object --stdin) if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git @@ -104,6 +104,7 @@ export LIBUV_VERSION=0.10.28 echo ' ...done' source iPhoneSimulator64.sh +export LIBUV_VERSION=0.10.28 if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi echo ' ...done' |