From ee8a8e3931c1d3f39755ee8beaf0c7cb1ba91888 Mon Sep 17 00:00:00 2001
From: "epoger@google.com"
 <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 18 Dec 2012 19:13:49 +0000
Subject: Re-land r6843 with copied gyp file to (hopefully) fix Windows build
 BUG=https://code.google.com/p/skia/issues/detail?id=1023 Review URL:
 https://codereview.appspot.com/6943073

git-svn-id: http://skia.googlecode.com/svn/trunk@6880 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 gyp/gm.gyp      |  3 +++
 gyp/jsoncpp.gyp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 gyp/jsoncpp.gyp

(limited to 'gyp')

diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 6f0fc3d377..4f8637fd06 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -10,6 +10,7 @@
       'include_dirs' : [
         '../src/core',
         '../src/pipe/utils/',
+        '../src/utils/',
       ],
       'includes': [
         'gmslides.gypi',
@@ -25,7 +26,9 @@
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
         'images.gyp:images',
+        'jsoncpp.gyp:jsoncpp',
         'pdf.gyp:pdf',
+        'utils.gyp:utils',
       ],
       'conditions': [
         ['skia_os == "mac"', {
diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp
new file mode 100644
index 0000000000..71815a79d7
--- /dev/null
+++ b/gyp/jsoncpp.gyp
@@ -0,0 +1,56 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO: This file was copied from the external dependency
+# third_party/externals/jsoncpp/jsoncpp.gyp , at revision 125399,
+# with directory paths modified to work at this level.
+#
+# It would be better for us to depend on that gypfile within the external
+# dependency, but so far we have been unable to make that work reliably.
+# See https://code.google.com/p/skia/issues/detail?id=1023
+
+{
+  'targets': [
+    {
+      'target_name': 'jsoncpp',
+      'type': 'static_library',
+      'defines': [
+        'JSON_USE_EXCEPTION=0',
+      ],
+      'sources': [
+        '../third_party/externals/jsoncpp/source/include/json/assertions.h',
+        '../third_party/externals/jsoncpp/source/include/json/autolink.h',
+        '../third_party/externals/jsoncpp/source/include/json/config.h',
+        '../third_party/externals/jsoncpp/source/include/json/features.h',
+        '../third_party/externals/jsoncpp/source/include/json/forwards.h',
+        '../third_party/externals/jsoncpp/source/include/json/json.h',
+        '../third_party/externals/jsoncpp/source/include/json/reader.h',
+        '../third_party/externals/jsoncpp/overrides/include/json/value.h',
+        '../third_party/externals/jsoncpp/source/include/json/writer.h',
+        '../third_party/externals/jsoncpp/source/src/lib_json/json_batchallocator.h',
+        '../third_party/externals/jsoncpp/source/src/lib_json/json_reader.cpp',
+        '../third_party/externals/jsoncpp/source/src/lib_json/json_tool.h',
+        '../third_party/externals/jsoncpp/overrides/src/lib_json/json_value.cpp',
+        '../third_party/externals/jsoncpp/source/src/lib_json/json_writer.cpp',
+      ],
+      'include_dirs': [
+        '../third_party/externals/jsoncpp/overrides/include/',
+        '../third_party/externals/jsoncpp/source/include/',
+        '../third_party/externals/jsoncpp/source/src/lib_json/',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/externals/jsoncpp/overrides/include/',
+          '../third_party/externals/jsoncpp/source/include/',
+        ],
+      },
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
-- 
cgit v1.2.3