From 3c2e7f1aadf3f6e9be7b86d1753d0bf26fd76e8f Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 24 Nov 2013 17:30:42 +0000
Subject: Fixed Visual Studio Files

---
 VC2008/JsonCpp.vcproj | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'VC2008/JsonCpp.vcproj')

diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 5fa1ec685..577507d50 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -276,31 +276,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_batchallocator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_internalarray.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_internalmap.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_reader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_value.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_valueiterator.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_writer.cpp"
 				>
 			</File>
 		</Filter>
-- 
cgit v1.2.3


From 3466d2cad9a5723c327c3a64123b5321df968ba5 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 25 Nov 2013 21:32:09 +0000
Subject: Fixed all outstanding VS compilation issues

Also updated VS2008 files.
---
 VC2008/JsonCpp.vcproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'VC2008/JsonCpp.vcproj')

diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 577507d50..8b35f170b 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -276,15 +276,15 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_batchallocator.h"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_batchallocator.h"
 				>
 			</File>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_internalarray.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_internalarray.inl"
 				>
 			</File>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_internalmap.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_internalmap.inl"
 				>
 			</File>
 			<File
@@ -292,15 +292,15 @@
 				>
 			</File>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_value.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_value.cpp"
 				>
 			</File>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_valueiterator.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl"
 				>
 			</File>
 			<File
-				RelativePath="../lib/jsoncpp\src\lib_json\json_writer.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_writer.cpp"
 				>
 			</File>
 		</Filter>
-- 
cgit v1.2.3


From 4fd876aa7c1b4ca80fd3c35ecf3d7bef7934bfae Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 4 Dec 2013 20:34:57 +0100
Subject: Added a new Debug_LuaStatic configuration.

This re-enables plugin debugging using Decoda, lost when we moved Lua out to a DLL.
---
 VC2008/JsonCpp.vcproj | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'VC2008/JsonCpp.vcproj')

diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 8b35f170b..f18f53471 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -266,6 +266,68 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug_LuaStatic|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../jsoncpp-src-0.5.0/include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
-- 
cgit v1.2.3


From fb2df4445810490ed06eed72e6a96f5fcc0c0155 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 4 Dec 2013 21:35:29 +0100
Subject: Fixed LuaStatic intermediate and output folders.

---
 VC2008/JsonCpp.vcproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'VC2008/JsonCpp.vcproj')

diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index f18f53471..6fae46445 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -268,8 +268,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_LuaStatic|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\JsonCpp"
+			IntermediateDirectory="$(ConfigurationName)\JsonCpp"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
-- 
cgit v1.2.3