From e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 24 Nov 2013 18:44:22 +0000
Subject: Attempt to fix compilation

---
 VC2008/MCServer.cbp    | 39 ++++++++++-----------------------------
 VC2008/MCServer.vcproj | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 41 deletions(-)

(limited to 'VC2008')

diff --git a/VC2008/MCServer.cbp b/VC2008/MCServer.cbp
index 1758f6410..0d63e9291 100644
--- a/VC2008/MCServer.cbp
+++ b/VC2008/MCServer.cbp
@@ -23,9 +23,6 @@
 					<Add directory="../jsoncpp-src-0.5.0/include" />
 					<Add directory="../lua-5.1.4/src" />
 					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
 					<Add directory=".." />
 					<Add directory="../expat" />
 				</Compiler>
@@ -34,9 +31,6 @@
 					<Add directory="../jsoncpp-src-0.5.0/include" />
 					<Add directory="../lua-5.1.4/src" />
 					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
 					<Add directory=".." />
 					<Add directory="../expat" />
 				</ResourceCompiler>
@@ -179,8 +173,8 @@
 		<Unit filename="../MCServer/terrain.ini" />
 		<Unit filename="../MCServer/users.ini" />
 		<Unit filename="../MCServer/webadmin.ini" />
-		<Unit filename="../iniFile/iniFile.cpp" />
-		<Unit filename="../iniFile/iniFile.h" />
+		<Unit filename="../lib/iniFile/iniFile.cpp" />
+		<Unit filename="../lib/iniFile/iniFile.h" />
 		<Unit filename="../src/AllToLua.pkg">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
@@ -368,10 +362,10 @@
 		<Unit filename="../src/LinearUpscale.h" />
 		<Unit filename="../src/Log.cpp" />
 		<Unit filename="../src/Log.h" />
-		<Unit filename="../src/LuaExpat/lxplib.c">
+		<Unit filename="../lib/luaexpat/lxplib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/LuaExpat/lxplib.h" />
+		<Unit filename="../lib/luaexpat/lxplib.h" />
 		<Unit filename="../src/LuaFunctions.h" />
 		<Unit filename="../src/MCLogger.cpp" />
 		<Unit filename="../src/MCLogger.h" />
@@ -479,10 +473,6 @@
 		<Unit filename="../src/Plugin.h" />
 		<Unit filename="../src/PluginManager.cpp" />
 		<Unit filename="../src/PluginManager.h" />
-		<Unit filename="../src/Plugin_NewLua.cpp" />
-		<Unit filename="../src/Plugin_NewLua.h" />
-		<Unit filename="../src/Plugin_Squirrel.cpp" />
-		<Unit filename="../src/Plugin_Squirrel.h" />
 		<Unit filename="../src/ProbabDistrib.cpp" />
 		<Unit filename="../src/ProbabDistrib.h" />
 		<Unit filename="../src/Protocol/ChunkDataSerializer.cpp" />
@@ -502,14 +492,14 @@
 		<Unit filename="../src/ReferenceManager.h" />
 		<Unit filename="../src/Root.cpp" />
 		<Unit filename="../src/Root.h" />
-		<Unit filename="../src/SQLite/lsqlite3.c">
+		<Unit filename="../lib/sqlite/lsqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/SQLite/sqlite3.c">
+		<Unit filename="../lib/sqlite/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../src/SQLite/sqlite3.h" />
-		<Unit filename="../src/SQLite/urls.txt" />
+		<Unit filename="../lib/sqlite/sqlite3.h" />
+		<Unit filename="../lib/sqlite/urls.txt" />
 		<Unit filename="../src/Server.cpp" />
 		<Unit filename="../src/Server.h" />
 		<Unit filename="../src/Sign.h" />
@@ -534,8 +524,6 @@
 		<Unit filename="../src/Simulator/SimulatorManager.h" />
 		<Unit filename="../src/Simulator/VaporizeFluidSimulator.cpp" />
 		<Unit filename="../src/Simulator/VaporizeFluidSimulator.h" />
-		<Unit filename="../src/SquirrelCommandBinder.cpp" />
-		<Unit filename="../src/SquirrelCommandBinder.h" />
 		<Unit filename="../src/StackWalker.h" />
 		<Unit filename="../src/Stairs.h" />
 		<Unit filename="../src/StringCompression.cpp" />
@@ -578,15 +566,8 @@
 		<Unit filename="../src/WorldStorage/WorldStorage.cpp" />
 		<Unit filename="../src/WorldStorage/WorldStorage.h" />
 		<Unit filename="../src/main.cpp" />
-		<Unit filename="../src/md5/md5.cpp" />
-		<Unit filename="../src/md5/md5.h" />
-		<Unit filename="../src/squirrelbindings/SquirrelArray.h" />
-		<Unit filename="../src/squirrelbindings/SquirrelBaseClass.h" />
-		<Unit filename="../src/squirrelbindings/SquirrelBindings.cpp" />
-		<Unit filename="../src/squirrelbindings/SquirrelBindings.h" />
-		<Unit filename="../src/squirrelbindings/SquirrelFunctions.cpp" />
-		<Unit filename="../src/squirrelbindings/SquirrelFunctions.h" />
-		<Unit filename="../src/squirrelbindings/SquirrelObject.h" />
+		<Unit filename="../lib/md5/md5.cpp" />
+		<Unit filename="../lib/md5/md5.h" />
 		<Unit filename="../src/tolua++.h" />
 		<Unit filename="../src/tolua_base.h" />
 		<Unit filename="../webadmin/template.html" />
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 1b710e1e4..524ffdfd4 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1685,7 +1685,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
-							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
+							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../lib/iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
 					</FileConfiguration>
@@ -1696,7 +1696,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
-							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
+							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../lib/iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
 					</FileConfiguration>
@@ -1707,7 +1707,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
-							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
+							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../lib/iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
 					</FileConfiguration>
@@ -1718,7 +1718,7 @@
 						<Tool
 							Name="VCCustomBuildTool"
 							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
-							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
+							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../lib/iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
 					</FileConfiguration>
@@ -1848,7 +1848,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\md5\md5.cpp"
+					RelativePath="..\lib\md5\md5.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1888,7 +1888,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\src\md5\md5.h"
+					RelativePath="..\lib\md5\md5.h"
 					>
 				</File>
 			</Filter>
@@ -2544,7 +2544,7 @@
 				Name="SQLite"
 				>
 				<File
-					RelativePath="..\src\sqlite\lsqlite3.c"
+					RelativePath="..\lib\sqlite\lsqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2580,7 +2580,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\src\sqlite\sqlite3.c"
+					RelativePath="..\lib\sqlite\sqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2616,11 +2616,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\src\sqlite\sqlite3.h"
+					RelativePath="..\lib\sqlite\sqlite3.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\sqlite\urls.txt"
+					RelativePath="..\lib\sqlite\urls.txt"
 					>
 				</File>
 			</Filter>
@@ -2628,7 +2628,7 @@
 				Name="LuaExpat"
 				>
 				<File
-					RelativePath="..\src\LuaExpat\lxplib.c"
+					RelativePath="..\lib\luaexpat\lxplib.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2664,7 +2664,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\src\LuaExpat\lxplib.h"
+					RelativePath="..\lib\luaexpat\lxplib.h"
 					>
 				</File>
 			</Filter>
-- 
cgit v1.2.3