diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-24 19:44:22 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-24 19:44:22 +0100 |
| commit | e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed (patch) | |
| tree | b2e2b7b92f7157f796851139a05fce30f222fdae | |
| parent | Moved SQLite, LuaExpat, and MD5 to /lib (diff) | |
| download | cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar.gz cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar.bz2 cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar.lz cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar.xz cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.tar.zst cuberite-e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed.zip | |
64 files changed, 132 insertions, 153 deletions
diff --git a/GNUmakefile b/GNUmakefile index ce5920e5b..2ddfefee9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -47,9 +47,9 @@ ifeq ($(release),1) # release build - fastest run-time, no gdb support ################ -CC_OPTIONS = -g -O3 -DNDEBUG -CXX_OPTIONS = -g -O3 -DNDEBUG -LNK_OPTIONS = -pthread -O3 +CC_OPTIONS = -g -Ofast -DNDEBUG +CXX_OPTIONS = -g -Ofast -DNDEBUG +LNK_OPTIONS = -pthread -Ofast BUILDDIR = build/release/ else @@ -58,18 +58,18 @@ ifeq ($(profile),1) # profile build - a release build with symbols and profiling engine built in ################ -CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG -CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG -LNK_OPTIONS = -pthread -ggdb -O3 -pg +CC_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG +CXX_OPTIONS = -s -g -ggdb -Ofast -pg -DNDEBUG +LNK_OPTIONS = -pthread -ggdb -Ofast -pg BUILDDIR = build/profile/ else ################ # debug build - fully traceable by gdb in C++ code, slowest -# Since C code is used only for supporting libraries (zlib, lua), it is still O3-optimized +# Since C code is used only for supporting libraries (zlib, lua), it is still Ofast-optimized ################ -CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3 +CC_OPTIONS = -s -ggdb -g -D_DEBUG -Ofast CXX_OPTIONS = -s -ggdb -g -D_DEBUG -Og LNK_OPTIONS = -pthread -g -ggdb -Og BUILDDIR = build/debug/ @@ -139,7 +139,6 @@ endif INCLUDE = -I.\ -Isrc\ - -Isrc/md5\ -Isrc/items\ -Isrce/blocks\ -Ilib 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="<{~None~}>" /> </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
" - AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" + AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../lib/iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1696,7 +1696,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" + AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../lib/iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1707,7 +1707,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" + AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../lib/iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1718,7 +1718,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" + AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../lib/iniFile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" 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> diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ad0a0c49a..ba2ca72d7 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug profiled|Win32"> @@ -332,8 +332,8 @@ <ClInclude Include="..\src\tolua++.h" /> <ClInclude Include="..\src\tolua_base.h" /> <ClInclude Include="..\src\WebPlugin.h" /> - <ClInclude Include="..\iniFile\iniFile.h" /> - <ClInclude Include="..\src\md5\md5.h" /> + <ClInclude Include="..\lib\iniFile\iniFile.h" /> + <ClInclude Include="..\lib\md5\md5.h" /> <ClInclude Include="..\src\WorldStorage\FastNBT.h" /> <ClInclude Include="..\src\WorldStorage\NBTChunkSerializer.h" /> <ClInclude Include="..\src\WorldStorage\WorldStorage.h" /> @@ -453,8 +453,8 @@ <ClInclude Include="..\src\Protocol\Protocol16x.h" /> <ClInclude Include="..\src\Protocol\Protocol17x.h" /> <ClInclude Include="..\src\Protocol\ProtocolRecognizer.h" /> - <ClInclude Include="..\src\sqlite\sqlite3.h" /> - <ClInclude Include="..\src\LuaExpat\lxplib.h" /> + <ClInclude Include="..\lib\sqlite\sqlite3.h" /> + <ClInclude Include="..\lib\luaexpat\lxplib.h" /> <ClInclude Include="..\src\BlockEntities\BlockEntity.h" /> <ClInclude Include="..\src\BlockEntities\BlockEntityWithItems.h" /> <ClInclude Include="..\src\BlockEntities\ChestEntity.h" /> @@ -754,8 +754,8 @@ <ClCompile Include="..\src\PluginLua.cpp" /> <ClCompile Include="..\src\PluginManager.cpp" /> <ClCompile Include="..\src\WebPlugin.cpp" /> - <ClCompile Include="..\iniFile\iniFile.cpp" /> - <ClCompile Include="..\src\md5\md5.cpp"> + <ClCompile Include="..\lib\iniFile\iniFile.cpp" /> + <ClCompile Include="..\lib\md5\md5.cpp"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> </PrecompiledHeader> @@ -807,7 +807,7 @@ <ClCompile Include="..\src\Protocol\Protocol16x.cpp" /> <ClCompile Include="..\src\Protocol\Protocol17x.cpp" /> <ClCompile Include="..\src\Protocol\ProtocolRecognizer.cpp" /> - <ClCompile Include="..\src\sqlite\lsqlite3.c"> + <ClCompile Include="..\lib\sqlite\lsqlite3.c"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -817,7 +817,7 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </PrecompiledHeader> </ClCompile> - <ClCompile Include="..\src\sqlite\sqlite3.c"> + <ClCompile Include="..\lib\sqlite\sqlite3.c"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -827,7 +827,7 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </PrecompiledHeader> </ClCompile> - <ClCompile Include="..\src\LuaExpat\lxplib.c"> + <ClCompile Include="..\lib\luaexpat\lxplib.c"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> </PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -857,7 +857,7 @@ </ItemGroup> <ItemGroup> <Text Include="..\MCServer\API.txt" /> - <Text Include="..\src\sqlite\urls.txt" /> + <Text Include="..\lib\sqlite\urls.txt" /> <Text Include="..\MCServer\crafting.txt" /> <Text Include="..\MCServer\furnace.txt" /> </ItemGroup> diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index 348c725f6..aecbcd557 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Resource Files"> @@ -513,10 +513,10 @@ <ClInclude Include="..\src\WebPlugin.h"> <Filter>Source Files\Bindings</Filter> </ClInclude> - <ClInclude Include="..\iniFile\iniFile.h"> + <ClInclude Include="..\lib\iniFile\iniFile.h"> <Filter>Source Files\External</Filter> </ClInclude> - <ClInclude Include="..\src\md5\md5.h"> + <ClInclude Include="..\lib\md5\md5.h"> <Filter>Source Files\External</Filter> </ClInclude> <ClInclude Include="..\src\WorldStorage\FastNBT.h"> @@ -876,10 +876,10 @@ <ClInclude Include="..\src\Protocol\ProtocolRecognizer.h"> <Filter>Source Files\Protocol</Filter> </ClInclude> - <ClInclude Include="..\src\sqlite\sqlite3.h"> + <ClInclude Include="..\lib\sqlite\sqlite3.h"> <Filter>Source Files\SQLite</Filter> </ClInclude> - <ClInclude Include="..\src\LuaExpat\lxplib.h"> + <ClInclude Include="..\lib\luaexpat\lxplib.h"> <Filter>Source Files\LuaExpat</Filter> </ClInclude> <ClInclude Include="..\src\BlockEntities\BlockEntity.h"> @@ -1474,10 +1474,10 @@ <ClCompile Include="..\src\WebPlugin.cpp"> <Filter>Source Files\Bindings</Filter> </ClCompile> - <ClCompile Include="..\iniFile\iniFile.cpp"> + <ClCompile Include="..\lib\iniFile\iniFile.cpp"> <Filter>Source Files\External</Filter> </ClCompile> - <ClCompile Include="..\src\md5\md5.cpp"> + <ClCompile Include="..\lib\md5\md5.cpp"> <Filter>Source Files\External</Filter> </ClCompile> <ClCompile Include="..\src\WorldStorage\FastNBT.cpp"> @@ -1594,13 +1594,13 @@ <ClCompile Include="..\src\Protocol\ProtocolRecognizer.cpp"> <Filter>Source Files\Protocol</Filter> </ClCompile> - <ClCompile Include="..\src\sqlite\lsqlite3.c"> + <ClCompile Include="..\lib\sqlite\lsqlite3.c"> <Filter>Source Files\SQLite</Filter> </ClCompile> - <ClCompile Include="..\src\sqlite\sqlite3.c"> + <ClCompile Include="..\lib\sqlite\sqlite3.c"> <Filter>Source Files\SQLite</Filter> </ClCompile> - <ClCompile Include="..\src\LuaExpat\lxplib.c"> + <ClCompile Include="..\lib\luaexpat\lxplib.c"> <Filter>Source Files\LuaExpat</Filter> </ClCompile> <ClCompile Include="..\src\BlockEntities\BlockEntity.cpp"> @@ -1659,7 +1659,7 @@ <Text Include="..\MCServer\API.txt"> <Filter>Source Files\Bindings</Filter> </Text> - <Text Include="..\src\sqlite\urls.txt"> + <Text Include="..\lib\sqlite\urls.txt"> <Filter>Source Files\SQLite</Filter> </Text> <Text Include="..\MCServer\crafting.txt"> diff --git a/lib/jsoncpp/src/lib_json/json_reader.cpp b/lib/jsoncpp/src/lib_json/json_reader.cpp index 7c94e612e..e9d6b88d2 100644 --- a/lib/jsoncpp/src/lib_json/json_reader.cpp +++ b/lib/jsoncpp/src/lib_json/json_reader.cpp @@ -1,5 +1,5 @@ -#include <json/reader.h> -#include <json/value.h> +#include "../../include/json/reader.h" +#include "../../include/json/value.h" #include <utility> #include <cstdio> #include <cassert> diff --git a/lib/jsoncpp/src/lib_json/json_value.cpp b/lib/jsoncpp/src/lib_json/json_value.cpp index 89271cd00..ea033c400 100644 --- a/lib/jsoncpp/src/lib_json/json_value.cpp +++ b/lib/jsoncpp/src/lib_json/json_value.cpp @@ -1,6 +1,6 @@ #include <iostream> -#include <json/value.h> -#include <json/writer.h> +#include "../../include/json/json.h" +#include "../../include/json/writer.h" #include <utility> #include <stdexcept> #include <cstring> diff --git a/lib/jsoncpp/src/lib_json/json_writer.cpp b/lib/jsoncpp/src/lib_json/json_writer.cpp index cdf4188f2..eff3fabeb 100644 --- a/lib/jsoncpp/src/lib_json/json_writer.cpp +++ b/lib/jsoncpp/src/lib_json/json_writer.cpp @@ -1,4 +1,4 @@ -#include <json/writer.h> +#include "../../include/json/writer.h" #include <utility> #include <assert.h> #include <stdio.h> diff --git a/lib/luaexpat/lxplib.c b/lib/luaexpat/lxplib.c index e26343ce9..053c59a34 100644 --- a/lib/luaexpat/lxplib.c +++ b/lib/luaexpat/lxplib.c @@ -9,10 +9,10 @@ #include <stdlib.h> #include <string.h> -#include "expat.h" +#include "../lib/expat/expat.h" -#include "lua.h" -#include "lauxlib.h" +#include "../lib/lua/src/lua.h" +#include "../lib/lua/src/lauxlib.h" #include "lxplib.h" diff --git a/lib/sqlite/lsqlite3.c b/lib/sqlite/lsqlite3.c index 4c81b5878..8098311ac 100644 --- a/lib/sqlite/lsqlite3.c +++ b/lib/sqlite/lsqlite3.c @@ -44,8 +44,8 @@ extern "C" { #include <assert.h> #define LUA_LIB -#include "lua.h" -#include "lauxlib.h" +#include "../lib/lua/src/lua.h" +#include "../lib/lua/src/lauxlib.h" #if LUA_VERSION_NUM > 501 // diff --git a/lib/tolua++/src/bin/tolua.c b/lib/tolua++/src/bin/tolua.c index cc9f9adcd..fd8e1ed1e 100644 --- a/lib/tolua++/src/bin/tolua.c +++ b/lib/tolua++/src/bin/tolua.c @@ -12,11 +12,11 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" +#include "../../../lua/src/lua.h" +#include "../../../lua/src/lualib.h" +#include "../../../lua/src/lauxlib.h" #include <stdio.h> #include <stdlib.h> diff --git a/lib/tolua++/src/lib/tolua_event.c b/lib/tolua++/src/lib/tolua_event.c index 8258867b4..3075a60b3 100644 --- a/lib/tolua++/src/lib/tolua_event.c +++ b/lib/tolua++/src/lib/tolua_event.c @@ -14,7 +14,7 @@ #include <stdio.h> -#include "tolua++.h" +#include "../../include/tolua++.h" /* Store at ubox * It stores, creating the corresponding table if needed, diff --git a/lib/tolua++/src/lib/tolua_is.c b/lib/tolua++/src/lib/tolua_is.c index c486b271e..b470477ff 100644 --- a/lib/tolua++/src/lib/tolua_is.c +++ b/lib/tolua++/src/lib/tolua_is.c @@ -12,8 +12,8 @@ ** enhancements, or modifications. */ -#include "tolua++.h" -#include "lauxlib.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include <stdlib.h> #include <string.h> diff --git a/lib/tolua++/src/lib/tolua_map.c b/lib/tolua++/src/lib/tolua_map.c index d00e7069b..7c4a22336 100644 --- a/lib/tolua++/src/lib/tolua_map.c +++ b/lib/tolua++/src/lib/tolua_map.c @@ -12,9 +12,9 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include "tolua_event.h" -#include "lauxlib.h" #include <string.h> #include <stdio.h> diff --git a/lib/tolua++/src/lib/tolua_push.c b/lib/tolua++/src/lib/tolua_push.c index 639414755..947f0e7a5 100644 --- a/lib/tolua++/src/lib/tolua_push.c +++ b/lib/tolua++/src/lib/tolua_push.c @@ -12,8 +12,8 @@ ** enhancements, or modifications. */ -#include "tolua++.h" -#include "lauxlib.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include <stdlib.h> diff --git a/lib/tolua++/src/lib/tolua_to.c b/lib/tolua++/src/lib/tolua_to.c index 542ca67d1..04132e901 100644 --- a/lib/tolua++/src/lib/tolua_to.c +++ b/lib/tolua++/src/lib/tolua_to.c @@ -12,7 +12,7 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" #include <string.h> #include <stdlib.h> diff --git a/src/Authenticator.cpp b/src/Authenticator.cpp index 9a6dcf51b..3371c2a1a 100644 --- a/src/Authenticator.cpp +++ b/src/Authenticator.cpp @@ -6,7 +6,7 @@ #include "Root.h" #include "Server.h" -#include "../iniFile/iniFile.h" +#include "../lib/iniFile/iniFile.h" #include <sstream> diff --git a/src/Bindings.cpp b/src/Bindings.cpp index ad3ad8423..cbb50a321 100644 --- a/src/Bindings.cpp +++ b/src/Bindings.cpp @@ -16,7 +16,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S); #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "tolua_base.h" #include "ChunkDef.h" -#include "../iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #include "OSSupport/File.h" #include "BlockID.h" #include "StringUtils.h" diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index ca2626bc9..3149166fd 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -5,7 +5,7 @@ #include "../Item.h" #include "../Entities/Player.h" #include "../UI/Window.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index ec5ebe8b9..a05dd5956 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -6,7 +6,7 @@ #include "../Entities/Player.h" #include "../Root.h" #include "../Chunk.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index aca376dd3..1b5c03826 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -3,7 +3,7 @@ #include "JukeboxEntity.h" #include "../World.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 1b0620299..6bb570133 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -3,7 +3,7 @@ #include "NoteEntity.h" #include "../World.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp index 81f6f6d77..9cbac5679 100644 --- a/src/BlockEntities/SignEntity.cpp +++ b/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 <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" #include "SignEntity.h" #include "../Entities/Player.h" diff --git a/src/BlockID.cpp b/src/BlockID.cpp index a4a1ab2d8..003f49848 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -4,7 +4,7 @@ #include "Globals.h" #include "BlockID.h" -#include "../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "Item.h" #include "Mobs/Monster.h" diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 7e71e9ea7..ec60a19bf 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -10,7 +10,7 @@ #include "World.h" #include "ClientHandle.h" #include "Server.h" -#include "zlib.h" +#include "../lib/zlib/zlib.h" #include "Defines.h" #include "BlockEntities/ChestEntity.h" #include "BlockEntities/DispenserEntity.h" @@ -34,7 +34,7 @@ #include "MobSpawner.h" -#include <json/json.h> +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index 9d55917e5..5937ee2e4 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -20,8 +20,8 @@ #include <cstdlib> // abs #endif -#include "zlib.h" -#include <json/json.h> +#include "lib/zlib/zlib.h" +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index f37a23f22..f4ddd979c 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -24,8 +24,8 @@ #include "../Vector3d.h" #include "../Vector3f.h" -#include "../../iniFile/iniFile.h" -#include <json/json.h> +#include "lib/iniFile/iniFile.h" +#include "lib/jsoncpp/include/json/json.h" #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x)) diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index 926120afc..c05778bb1 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "BioGen.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index 33c956eba..a7107e325 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -3,7 +3,7 @@ #include "ChunkGenerator.h" #include "../World.h" -#include "../../iniFile/iniFile.h" +#include "../lib/iniFile/iniFile.h" #include "../Root.h" #include "../PluginManager.h" #include "ChunkDesc.h" diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp index cc2a203af..9b93fcf3b 100644 --- a/src/Generating/CompoGen.cpp +++ b/src/Generating/CompoGen.cpp @@ -12,7 +12,7 @@ #include "../BlockID.h" #include "../Item.h" #include "../LinearUpscale.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp index 2637b64e7..40914605a 100644 --- a/src/Generating/ComposableGenerator.cpp +++ b/src/Generating/ComposableGenerator.cpp @@ -7,7 +7,7 @@ #include "ComposableGenerator.h" #include "../World.h" -#include "../../iniFile/iniFile.h" +#include "../lib/iniFile/iniFile.h" #include "../Root.h" // Individual composed algorithms: diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp index 7e46c251e..ae5cd02e8 100644 --- a/src/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -7,7 +7,7 @@ #include "DistortedHeightmap.h" #include "../OSSupport/File.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp index 90a8071fa..750a30f91 100644 --- a/src/Generating/EndGen.cpp +++ b/src/Generating/EndGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "EndGen.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp index 5dee181b7..9e656d269 100644 --- a/src/Generating/HeiGen.cpp +++ b/src/Generating/HeiGen.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "HeiGen.h" #include "../LinearUpscale.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp index 03626a800..36ef55e89 100644 --- a/src/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "Noise3DGenerator.h" #include "../OSSupport/File.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp index d7332fd0a..55065b38e 100644 --- a/src/GroupManager.cpp +++ b/src/GroupManager.cpp @@ -2,7 +2,7 @@ #include "GroupManager.h" #include "Group.h" -#include "../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "ChatColor.h" #include "Root.h" diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h index fea2a9029..65cdcb3a5 100644 --- a/src/HTTPServer/HTTPServer.h +++ b/src/HTTPServer/HTTPServer.h @@ -11,7 +11,7 @@ #include "../OSSupport/ListenThread.h" #include "../OSSupport/SocketThreads.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" diff --git a/src/Inventory.cpp b/src/Inventory.cpp index 90b998358..3939598d7 100644 --- a/src/Inventory.cpp +++ b/src/Inventory.cpp @@ -9,7 +9,7 @@ #include "Root.h" #include "World.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" #include "Items/ItemHandler.h" diff --git a/src/Item.cpp b/src/Item.cpp index 25664e4df..219edb128 100644 --- a/src/Item.cpp +++ b/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 <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" #include "Items/ItemHandler.h" diff --git a/src/LuaState.cpp b/src/LuaState.cpp index 644f4972c..3a0008d4f 100644 --- a/src/LuaState.cpp +++ b/src/LuaState.cpp @@ -8,7 +8,7 @@ extern "C" { - #include "lualib.h" + #include"lib/lua/src/lualib.h" } #include "tolua++.h" diff --git a/src/LuaState.h b/src/LuaState.h index aa71ee226..9a486bfd1 100644 --- a/src/LuaState.h +++ b/src/LuaState.h @@ -26,7 +26,7 @@ automatic resource management. extern "C" { - #include "lauxlib.h" + #include "../lib/lua/src/lauxlib.h" } diff --git a/src/LuaWindow.cpp b/src/LuaWindow.cpp index 9011d668c..f49ba2109 100644 --- a/src/LuaWindow.cpp +++ b/src/LuaWindow.cpp @@ -8,7 +8,7 @@ #include "UI/SlotArea.h" #include "PluginLua.h" #include "Entities/Player.h" -#include "lauxlib.h" // Needed for LUA_REFNIL +#include "lib/lua/src/lauxlib.h" // Needed for LUA_REFNIL diff --git a/src/ManualBindings.cpp b/src/ManualBindings.cpp index 02b3347f6..7ea382b76 100644 --- a/src/ManualBindings.cpp +++ b/src/ManualBindings.cpp @@ -17,7 +17,7 @@ #include "BlockEntities/DropperEntity.h" #include "BlockEntities/FurnaceEntity.h" #include "BlockEntities/HopperEntity.h" -#include "md5/md5.h" +#include "lib/md5/md5.h" #include "LuaWindow.h" #include "LineBlockTracer.h" diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp index a5a1ebd49..b72324124 100644 --- a/src/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -3,8 +3,7 @@ #include "MonsterConfig.h" #include "Mobs/Monster.h" -#include "../iniFile/iniFile.h" -//#include <cstdio> +#include "../lib/inifile/iniFile.h" diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h index e5aa68afa..df86717f6 100644 --- a/src/OSSupport/GZipFile.h +++ b/src/OSSupport/GZipFile.h @@ -9,7 +9,7 @@ #pragma once -#include "zlib.h" +#include "../lib/zlib/zlib.h" diff --git a/src/PluginLua.cpp b/src/PluginLua.cpp index 23d079b05..0afd3844a 100644 --- a/src/PluginLua.cpp +++ b/src/PluginLua.cpp @@ -11,7 +11,7 @@ extern "C" { - #include "lualib.h" + #include"lib/lua/src/lualib.h" } #include "tolua++.h" diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index e08ebe503..f9d8d7d02 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -10,7 +10,7 @@ #include "Server.h" #include "CommandOutput.h" -#include "../iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #include "tolua++.h" #include "Entities/Player.h" diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp index 2a9230fee..c83a87ca9 100644 --- a/src/Protocol/ChunkDataSerializer.cpp +++ b/src/Protocol/ChunkDataSerializer.cpp @@ -7,7 +7,7 @@ #include "Globals.h" #include "ChunkDataSerializer.h" -#include "zlib.h" +#include "../lib/zlib/zlib.h" diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp index 22eac4312..bfa8eb412 100644 --- a/src/Protocol/Protocol132.cpp +++ b/src/Protocol/Protocol132.cpp @@ -4,14 +4,14 @@ // Implements the cProtocol132 class representing the release 1.3.2 protocol (#39) #include "Globals.h" +#include "ChunkDataSerializer.h" #include "Protocol132.h" #include "../Root.h" #include "../Server.h" #include "../World.h" #include "../ClientHandle.h" -#include "../../CryptoPP/randpool.h" +#include "../lib/cryptopp/randpool.h" #include "../Item.h" -#include "ChunkDataSerializer.h" #include "../Entities/Player.h" #include "../Mobs/Monster.h" #include "../UI/Window.h" diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h index dc4d8aeef..58e98c208 100644 --- a/src/Protocol/Protocol132.h +++ b/src/Protocol/Protocol132.h @@ -10,8 +10,8 @@ #pragma once #include "Protocol125.h" -#include "../../CryptoPP/modes.h" -#include "../../CryptoPP/aes.h" +#include "../lib/cryptopp/modes.h" +#include "../lib/cryptopp/aes.h" diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp index d2582458b..9fb2a8133 100644 --- a/src/Protocol/Protocol14x.cpp +++ b/src/Protocol/Protocol14x.cpp @@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols: #include "../Root.h" #include "../Server.h" #include "../ClientHandle.h" -#include "../../CryptoPP/randpool.h" +#include "../lib/cryptopp/randpool.h" #include "../Item.h" #include "ChunkDataSerializer.h" #include "../Entities/Player.h" diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h index e3f2ad922..b55bbf80b 100644 --- a/src/Protocol/Protocol17x.h +++ b/src/Protocol/Protocol17x.h @@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes: #include "Protocol.h" #include "../ByteBuffer.h" -#include "../../CryptoPP/modes.h" -#include "../../CryptoPP/aes.h" +#include "../lib/cryptopp/modes.h" +#include "../lib/cryptopp/aes.h" diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp index 3f86a7ca2..f90e9f191 100644 --- a/src/RCONServer.cpp +++ b/src/RCONServer.cpp @@ -4,7 +4,7 @@ // Implements the cRCONServer class representing the RCON server #include "Globals.h" -#include "../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" #include "RCONServer.h" #include "Server.h" #include "Root.h" diff --git a/src/Root.cpp b/src/Root.cpp index 5bb04abfb..282227525 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -19,7 +19,7 @@ #include "DeadlockDetect.h" #include "OSSupport/Timer.h" -#include "../iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #ifdef _WIN32 #include <psapi.h> diff --git a/src/Server.cpp b/src/Server.cpp index fe8076631..5f0e007d7 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -23,7 +23,7 @@ #include "MersenneTwister.h" -#include "../iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #include "Vector3f.h" #include <fstream> @@ -31,7 +31,7 @@ #include <iostream> extern "C" { - #include "zlib.h" + #include "lib/zlib/zlib.h" } diff --git a/src/Server.h b/src/Server.h index 1b4848318..93a978654 100644 --- a/src/Server.h +++ b/src/Server.h @@ -11,8 +11,8 @@ #include "OSSupport/SocketThreads.h" #include "OSSupport/ListenThread.h" -#include "CryptoPP/rsa.h" -#include "CryptoPP/randpool.h" +#include "../lib/cryptopp/rsa.h" +#include "../lib/cryptopp/randpool.h" #include "RCONServer.h" diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h index e1d88f1c5..9d3ad4131 100644 --- a/src/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -2,7 +2,7 @@ #pragma once #include "../Vector3i.h" -#include "../../iniFile/iniFile.h" +#include "../lib/inifile/iniFile.h" diff --git a/src/StringCompression.h b/src/StringCompression.h index 8afdf59e0..1257d7d6b 100644 --- a/src/StringCompression.h +++ b/src/StringCompression.h @@ -3,7 +3,7 @@ // Interfaces to the wrapping functions for compression and decompression using AString as their data -#include "zlib.h" // Needed for the Z_XXX return values +#include "../lib/zlib/zlib.h" // Needed for the Z_XXX return values diff --git a/src/WebAdmin.h b/src/WebAdmin.h index dc6ea850e..0bceb9f82 100644 --- a/src/WebAdmin.h +++ b/src/WebAdmin.h @@ -7,7 +7,7 @@ #include "OSSupport/Socket.h" #include "LuaState.h" -#include "../iniFile/iniFile.h" +#include "../lib/iniFile/iniFile.h" #include "HTTPServer/HTTPServer.h" #include "HTTPServer/HTTPFormParser.h" diff --git a/src/World.cpp b/src/World.cpp index 531952e37..96111ab57 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -8,7 +8,7 @@ #include "Server.h" #include "Item.h" #include "Root.h" -#include "../iniFile/iniFile.h" +#include "../lib/iniFile/iniFile.h" #include "ChunkMap.h" #include "OSSupport/Timer.h" diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index b2e104a78..ee7511486 100644 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -7,7 +7,7 @@ #include "WSSAnvil.h" #include "NBTChunkSerializer.h" #include "../World.h" -#include "zlib.h" +#include "../lib/zlib/zlib.h" #include "../BlockID.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp index 694f3ed1d..812c60411 100644 --- a/src/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -6,8 +6,8 @@ #include "Globals.h" #include "WSSCompact.h" #include "../World.h" -#include "zlib.h" -#include <json/json.h> +#include "../lib/zlib/zlib.h" +#include "../lib/jsoncpp/include/json/json.h" #include "../StringCompression.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index bf8dbd3d5..384ade081 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -16,7 +16,7 @@ #include "../ChunkDef.h" #include "../OSSupport/IsThread.h" -#include <json/json.h> +#include "../lib/jsoncpp/include/json/json.h" diff --git a/src/tolua++.h b/src/tolua++.h index ed5344926..dff1e91be 100644 --- a/src/tolua++.h +++ b/src/tolua++.h @@ -43,8 +43,8 @@ extern "C" { typedef int lua_Object; -#include "lua.h" -#include "lauxlib.h" +#include "../lib/lua/src/lua.h" +#include "../lib/lua/src/lauxlib.h" struct tolua_Error { |