f01a6c3663
Always build the tools with JSON, but either build our own or use the system's. Rename skia_build_json_writer to skia_use_system_jsoncpp, since we now always build with JSON. Remove SK_BUILD_JSON_WRITER, which was only there so we could build without JSON it in the framework. BUG=skia:2448 R=djsollen@google.com, reed@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/303913002
28 lines
748 B
C
28 lines
748 B
C
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*
|
|
* A common place to put the jsoncpp library includes, as opposed to littering
|
|
* the pragmas repeatedly through our code.
|
|
*/
|
|
#ifndef SkJSONCPP_DEFINED
|
|
#define SkJSONCPP_DEFINED
|
|
|
|
#ifdef SK_BUILD_FOR_WIN
|
|
// json includes xlocale which generates warning 4530 because we're
|
|
// compiling without exceptions;
|
|
// see https://code.google.com/p/skia/issues/detail?id=1067
|
|
#pragma warning(push)
|
|
#pragma warning(disable : 4530)
|
|
#endif
|
|
#include "json/reader.h"
|
|
#include "json/value.h"
|
|
#include "json/writer.h"
|
|
#ifdef SK_BUILD_FOR_WIN
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#endif // SkJSONCPP_DEFINED
|