Fixed VC2008 compilation, normalized include paths.

GNUmakefile

@@ -143,9 +143,8 @@ endif
 
 INCLUDE = -I.\
 		-Isrc\
-		-Isrc/items\
-		-Isrce/blocks\
 		-Ilib\
+		-Ilib/jsoncpp/include
 
 
 

VC2008/MCServer.vcproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+				AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+				AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -200,7 +200,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+				AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -277,7 +277,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+				AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -1219,6 +1219,14 @@
 					RelativePath="..\src\Entities\Entity.h"
 					>
 				</File>
+				<File
+					RelativePath="..\src\Entities\ExpOrb.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\Entities\ExpOrb.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\Entities\FallingBlock.cpp"
 					>
@@ -1271,14 +1279,6 @@
 					RelativePath="..\src\Entities\TNTEntity.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\src\Entities\ExpOrb.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Entities\ExpOrb.h"
-					>
-				</File>
 				<File
 					RelativePath="..\src\Entities\TNTEntity.cpp"
 					>

lib/luaexpat/lxplib.c

@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lib/expat/expat.h"
+#include "expat/expat.h"
 
-#include "lib/lua/src/lua.h"
-#include "lib/lua/src/lauxlib.h"
+#include "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
 
 
 #include "lxplib.h"

lib/sqlite/lsqlite3.c

@@ -44,8 +44,8 @@ extern "C" {
 #include <assert.h>
 
 #define LUA_LIB
-#include "lib/lua/src/lua.h"
-#include "lib/lua/src/lauxlib.h"
+#include "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
 
 #if LUA_VERSION_NUM > 501
 //

src/BlockEntities/ChestEntity.cpp

@@ -5,7 +5,7 @@
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/BlockEntities/FurnaceEntity.cpp

@@ -6,7 +6,7 @@
 #include "../Entities/Player.h"
 #include "../Root.h"
 #include "../Chunk.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/BlockEntities/JukeboxEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "JukeboxEntity.h"
 #include "../World.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/BlockEntities/NoteEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "NoteEntity.h"
 #include "../World.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/BlockEntities/SignEntity.cpp

@@ -4,7 +4,7 @@
 // Implements the cSignEntity class representing a single sign in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 #include "SignEntity.h"
 #include "../Entities/Player.h"
 

src/Chunk.cpp

@@ -34,7 +34,7 @@
 #include "MobSpawner.h"
 
 
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/ChunkMap.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #include "zlib/zlib.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 
 

src/Entities/Player.cpp

@@ -25,7 +25,7 @@
 #include "../Vector3f.h"
 
 #include "inifile/iniFile.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
 

src/Inventory.cpp

@@ -9,7 +9,7 @@
 #include "Root.h"
 #include "World.h"
 
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 
 #include "Items/ItemHandler.h"
 

src/Item.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Item.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 #include "Items/ItemHandler.h"
 
 

src/WorldStorage/WSSCompact.cpp

@@ -7,7 +7,7 @@
 #include "WSSCompact.h"
 #include "../World.h"
 #include "zlib/zlib.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
 #include "../StringCompression.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DispenserEntity.h"

src/WorldStorage/WorldStorage.h

@@ -16,7 +16,7 @@
 
 #include "../ChunkDef.h"
 #include "../OSSupport/IsThread.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"