From 0b1de9ba878b3ca61c99d5ef6d0cb45fb7baf61d Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Fri, 21 Mar 2014 21:11:19 -0400
Subject: [PATCH 1/2] Correct my mistake from 83df0ad3d6ac.

...3+ years too late!

This should compile in all systems due to NotesLoaderJson inclusion.
---
 extern/jsoncpp/src/lib_json/json_reader.cpp | 4 ++--
 extern/jsoncpp/src/lib_json/json_value.cpp  | 4 ++--
 extern/jsoncpp/src/lib_json/json_writer.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extern/jsoncpp/src/lib_json/json_reader.cpp b/extern/jsoncpp/src/lib_json/json_reader.cpp
index 86cafcafaa..3e79ab733e 100644
--- a/extern/jsoncpp/src/lib_json/json_reader.cpp
+++ b/extern/jsoncpp/src/lib_json/json_reader.cpp
@@ -1,5 +1,5 @@
-#include <../extern/jsoncpp/include/json/reader.h>
-#include <../extern/jsoncpp/include/json/value.h>
+#include "json/reader.h"
+#include "json/value.h"
 #include <utility>
 #include <cstdio>
 #include <cassert>
diff --git a/extern/jsoncpp/src/lib_json/json_value.cpp b/extern/jsoncpp/src/lib_json/json_value.cpp
index fb480daa4a..1ecacd45d0 100644
--- a/extern/jsoncpp/src/lib_json/json_value.cpp
+++ b/extern/jsoncpp/src/lib_json/json_value.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <../extern/jsoncpp/include/json/value.h>
-#include <../extern/jsoncpp/include/json/writer.h>
+#include "json/value.h"
+#include "json/writer.h"
 #include <utility>
 #include <stdexcept>
 #include <cstring>
diff --git a/extern/jsoncpp/src/lib_json/json_writer.cpp b/extern/jsoncpp/src/lib_json/json_writer.cpp
index 7868a22cbf..41373250bb 100644
--- a/extern/jsoncpp/src/lib_json/json_writer.cpp
+++ b/extern/jsoncpp/src/lib_json/json_writer.cpp
@@ -1,4 +1,4 @@
-#include <../extern/jsoncpp/include/json/writer.h>
+#include "json/writer.h"
 #include <utility>
 #include <assert.h>
 #include <stdio.h>

From 9738ba9b20865b0f41861d8ccf11d5897bdc664c Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Fri, 21 Mar 2014 21:22:25 -0400
Subject: [PATCH 2/2] Move JSON to separate project (2011)

---
 extern/jsoncpp/libjson-net2011.vcxproj        | 88 +++++++++++++++++++
 .../jsoncpp/libjson-net2011.vcxproj.filters   |  8 ++
 src/StepMania-net2011.vcxproj                 | 33 +------
 src/StepMania-net2011.vcxproj.filters         | 15 ----
 src/sm5-net2011.sln                           | 10 +++
 5 files changed, 109 insertions(+), 45 deletions(-)
 create mode 100644 extern/jsoncpp/libjson-net2011.vcxproj
 create mode 100644 extern/jsoncpp/libjson-net2011.vcxproj.filters

diff --git a/extern/jsoncpp/libjson-net2011.vcxproj b/extern/jsoncpp/libjson-net2011.vcxproj
new file mode 100644
index 0000000000..8d4c2eb738
--- /dev/null
+++ b/extern/jsoncpp/libjson-net2011.vcxproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0DCAA088-FC09-4422-892B-8E89F1F798CB}</ProjectGuid>
+    <RootNamespace>libjson</RootNamespace>
+    <ProjectName>libjson</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(IntDir)</OutDir>
+    <IntDir>$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(IntDir)</OutDir>
+    <IntDir>$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+      <AdditionalIncludeDirectories>./include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+      <AdditionalIncludeDirectories>./include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\lib_json\json_reader.cpp" />
+    <ClCompile Include="src\lib_json\json_value.cpp" />
+    <ClCompile Include="src\lib_json\json_writer.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/extern/jsoncpp/libjson-net2011.vcxproj.filters b/extern/jsoncpp/libjson-net2011.vcxproj.filters
new file mode 100644
index 0000000000..23fe16e111
--- /dev/null
+++ b/extern/jsoncpp/libjson-net2011.vcxproj.filters
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="src\lib_json\json_reader.cpp" />
+    <ClCompile Include="src\lib_json\json_value.cpp" />
+    <ClCompile Include="src\lib_json\json_writer.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj
index 846feec821..2a974356c5 100644
--- a/src/StepMania-net2011.vcxproj
+++ b/src/StepMania-net2011.vcxproj
@@ -1222,36 +1222,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_reader.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_value.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_writer.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Screen.h" />
@@ -1914,6 +1884,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
     <ProjectReference Include="..\extern\glew-1.5.8\libglew-net2011.vcxproj">
       <Project>{9522f2e6-ffeb-4620-9ee2-79353a55671b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\extern\jsoncpp\libjson-net2011.vcxproj">
+      <Project>{0dcaa088-fc09-4422-892b-8e89f1f798cb}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\extern\libpng\libpng-net2011.vcxproj">
       <Project>{046c857a-41c5-4e87-ad44-462ab17bbf4f}</Project>
     </ProjectReference>
diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters
index 9b43a92ff6..f791d86e40 100644
--- a/src/StepMania-net2011.vcxproj.filters
+++ b/src/StepMania-net2011.vcxproj.filters
@@ -97,12 +97,6 @@
     <Filter Include="BaseClasses">
       <UniqueIdentifier>{2d157d5c-7c0e-4967-925a-3976a6ad0dd0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Helpers">
-      <UniqueIdentifier>{46a5ab77-6eaf-44eb-93ec-43b2db4741ff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Helpers\jsoncpp">
-      <UniqueIdentifier>{52c8e19c-32ec-4115-bee6-f5957389d7ea}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Screen.cpp">
@@ -1443,15 +1437,6 @@
     <ClCompile Include="BaseClasses\wxutil.cpp">
       <Filter>BaseClasses</Filter>
     </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_reader.cpp">
-      <Filter>Helpers\jsoncpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_value.cpp">
-      <Filter>Helpers\jsoncpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\extern\jsoncpp\src\lib_json\json_writer.cpp">
-      <Filter>Helpers\jsoncpp</Filter>
-    </ClCompile>
     <ClCompile Include="SongPosition.cpp">
       <Filter>Data Structures</Filter>
     </ClCompile>
diff --git a/src/sm5-net2011.sln b/src/sm5-net2011.sln
index c7498d19cc..b3c11814db 100644
--- a/src/sm5-net2011.sln
+++ b/src/sm5-net2011.sln
@@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglew", "..\extern\glew-1
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\extern\lua-5.1\liblua-net2011.vcxproj", "{0555A743-D202-409C-A331-349FEE971025}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "..\extern\jsoncpp\libjson-net2011.vcxproj", "{0DCAA088-FC09-4422-892B-8E89F1F798CB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -79,6 +81,14 @@ Global
 		{0555A743-D202-409C-A331-349FEE971025}.Release|Win32.Build.0 = Release|Win32
 		{0555A743-D202-409C-A331-349FEE971025}.Release-SSE2|Win32.ActiveCfg = Release|Win32
 		{0555A743-D202-409C-A331-349FEE971025}.Release-SSE2|Win32.Build.0 = Release|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Debug|Win32.Build.0 = Debug|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.FastDebug|Win32.ActiveCfg = Debug|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.FastDebug|Win32.Build.0 = Debug|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Release|Win32.ActiveCfg = Release|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Release|Win32.Build.0 = Release|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Release-SSE2|Win32.ActiveCfg = Release|Win32
+		{0DCAA088-FC09-4422-892B-8E89F1F798CB}.Release-SSE2|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE