| commit | 2eb3b4d7ea1a3cbb0f8775de3b6d92c0a6152f9f | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Mon Jan 11 14:41:40 2016 -0500 |
| committer | Derek Sollenberger <djsollen@google.com> | Mon Jan 11 20:20:14 2016 +0000 |
| tree | 58b7078bd9f0353e4f34119ff3dce5e1b989ab2d | |
| parent | 7daccb3a43871796f8f6c4f70e3b8be79e7e65b2 [diff] [blame] |
Upgrade jsoncpp to version 1.0.0 to match the copy used by Skia's testing tools. This mirrors the contents of the upstream repository at... https://github.com/open-source-parsers/jsoncpp/commit/7165f6ac4c482e68475c9e1dac086f9e12fff0d0 Bug: 17997234 Change-Id: I87a8312f9d030e5027f4ca5b1568f8374a856632
diff --git a/SConstruct b/SConstruct index 23225cb..1c55bcd 100644 --- a/SConstruct +++ b/SConstruct
@@ -119,7 +119,7 @@ env.Append( CPPDEFINES=[ "WIN32", "NDEBUG", "_MT" ] ) elif platform.startswith('linux-gcc'): env.Tool( 'default' ) - env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) + env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") ) env['SHARED_LIB_ENABLED'] = True else: print "UNSUPPORTED PLATFORM."