Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	platform/default/http_request_baton_curl.cpp
This commit is contained in:
Leith Bade
2014-12-10 19:13:21 +11:00
12 changed files with 164 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
#ifndef MBGL_UTIL_CONSTANTS
#define MBGL_UTIL_CONSTANTS
#include <cmath>
namespace mbgl {
namespace util {
extern const float tileSize;
}
namespace debug {
extern const bool tileParseWarnings;
extern const bool styleParseWarnings;
extern const bool spriteWarnings;
extern const bool renderWarnings;
extern const bool renderTree;
extern const bool labelTextMissingWarning;
extern const bool missingFontStackWarning;
extern const bool missingFontFaceWarning;
extern const bool glyphWarning;
extern const bool shapingWarning;
}
}
#endif