actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[sm130futures] json good on Windows.

Browse Source
This commit is contained in:
Jason Felds
2011-05-04 22:11:55 -04:00
parent 83df0ad3d6
commit d8f2e2ed20
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extern/jsoncpp/src/lib_json/json_reader.cpp
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
#include <jsoncpp/include/json/reader.h> #include <../extern/jsoncpp/include/json/reader.h>
#include <jsoncpp/include/json/value.h> #include <../extern/jsoncpp/include/json/value.h>
#include <utility> #include <utility>
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
extern/jsoncpp/src/lib_json/json_value.cpp
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
#include <iostream> #include <iostream>
#include <jsoncpp/include/json/value.h> #include <../extern/jsoncpp/include/json/value.h>
#include <jsoncpp/include/json/writer.h> #include <../extern/jsoncpp/include/json/writer.h>
#include <utility> #include <utility>
#include <stdexcept> #include <stdexcept>
#include <cstring> #include <cstring>
extern/jsoncpp/src/lib_json/json_writer.cpp
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
#include <jsoncpp/include/json/writer.h> #include <../extern/jsoncpp/include/json/writer.h>
#include <utility> #include <utility>
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
src/JsonUtil.cpp
+2 -2
View File
@@ -4,8 +4,8 @@
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include "arch/Dialog/Dialog.h" #include "arch/Dialog/Dialog.h"
#include "jsoncpp/include/json/reader.h" #include "../extern/jsoncpp/include/json/reader.h"
#include "jsoncpp/include/json/writer.h" #include "../extern/jsoncpp/include/json/writer.h"
bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut) bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut)
{ {
src/JsonUtil.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JsonUtil_H #define JsonUtil_H
class RageFileBasic; class RageFileBasic;
#include "jsoncpp/include/json/value.h" #include "../extern/jsoncpp/include/json/value.h"
/** @brief Utilities for handling JSON data. */ /** @brief Utilities for handling JSON data. */
namespace JsonUtil namespace JsonUtil
{ {
src/ScreenInstallOverlay.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "Preference.h" #include "Preference.h"
#include "RageLog.h" #include "RageLog.h"
#include "FileDownload.h" #include "FileDownload.h"
#include "jsoncpp/include/json/value.h" #include "../extern/jsoncpp/include/json/value.h"
#include "JsonUtil.h" #include "JsonUtil.h"
#include "SpecialFiles.h" #include "SpecialFiles.h"
class Song; class Song;
src/StepMania-net2008.vcproj
+7 -7
View File
@@ -50,7 +50,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@@ -157,7 +157,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -261,7 +261,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0" ExceptionHandling="0"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@@ -368,7 +368,7 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;jsoncpp/include;&quot;..\extern\glew-1.5.8\include&quot;" AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true" StringPooling="true"
MinimalRebuild="false" MinimalRebuild="false"
@@ -7896,7 +7896,7 @@
Name="jsoncpp" Name="jsoncpp"
> >
<File <File
RelativePath="jsoncpp\src\lib_json\json_reader.cpp" RelativePath="..\extern\jsoncpp\src\lib_json\json_reader.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@@ -7932,7 +7932,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="jsoncpp\src\lib_json\json_value.cpp" RelativePath="..\extern\jsoncpp\src\lib_json\json_value.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
@@ -7968,7 +7968,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="jsoncpp\src\lib_json\json_writer.cpp" RelativePath="..\extern\jsoncpp\src\lib_json\json_writer.cpp"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"