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 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {0DCAA088-FC09-4422-892B-8E89F1F798CB} + libjson + libjson + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + + Level3 + Disabled + true + + + ./include + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + ./include + + + true + true + true + + + + + + + + + + + \ 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 @@ + + + + + + + + \ 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)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1914,6 +1884,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" {9522f2e6-ffeb-4620-9ee2-79353a55671b} + + {0dcaa088-fc09-4422-892b-8e89f1f798cb} + {046c857a-41c5-4e87-ad44-462ab17bbf4f} 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 @@ {2d157d5c-7c0e-4967-925a-3976a6ad0dd0} - - {46a5ab77-6eaf-44eb-93ec-43b2db4741ff} - - - {52c8e19c-32ec-4115-bee6-f5957389d7ea} - @@ -1443,15 +1437,6 @@ BaseClasses - - Helpers\jsoncpp - - - Helpers\jsoncpp - - - Helpers\jsoncpp - Data Structures 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