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

Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown

Browse Source 
Conflicts:
	common/headless_view.cpp
This commit is contained in:
Mike Morris
2014-09-24 22:40:07 -04:00
parent 3dec4933a9 92d00347a8
commit 11f9081274
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/headless_view.cpp
View File

@@ -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");
}

3
setup-libraries.sh
View File

@@ -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'