ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix compilation

master
Tiger Wang 2013-11-24 18:44:22 +00:00
parent 16435995a5
commit e3db69c4ae
64 changed files with 132 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GNUmakefile
View File

@ -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

39
VC2008/MCServer.cbp
View File

@ -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" />

24
VC2008/MCServer.vcproj
View File

@ -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>

22
VC2013/MCServer.vcxproj
View File

@ -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>

22
VC2013/MCServer.vcxproj.filters
View File

@ -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">

4
lib/jsoncpp/src/lib_json/json_reader.cpp
View File

@ -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>

4
lib/jsoncpp/src/lib_json/json_value.cpp
View File

@ -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>

2
lib/jsoncpp/src/lib_json/json_writer.cpp
View File

@ -1,4 +1,4 @@
#include <json/writer.h>
#include "../../include/json/writer.h"
#include <utility>
#include <assert.h>
#include <stdio.h>

6
lib/luaexpat/lxplib.c
View File

@ -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"

4
lib/sqlite/lsqlite3.c
View File

@ -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
//

8
lib/tolua++/src/bin/tolua.c
View File

@ -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>

2
lib/tolua++/src/lib/tolua_event.c
View File

@ -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,

4
lib/tolua++/src/lib/tolua_is.c
View File

@ -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>

4
lib/tolua++/src/lib/tolua_map.c
View File

@ -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>

4
lib/tolua++/src/lib/tolua_push.c
View File

@ -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>

2
lib/tolua++/src/lib/tolua_to.c
View File

@ -12,7 +12,7 @@
** enhancements, or modifications.
*/
#include "tolua++.h"
#include "../../include/tolua++.h"
#include <string.h>
#include <stdlib.h>

2
src/Authenticator.cpp
View File

@ -6,7 +6,7 @@
#include "Root.h"
#include "Server.h"
#include "../iniFile/iniFile.h"
#include "../lib/iniFile/iniFile.h"
#include <sstream>

2
src/Bindings.cpp
View File

@ -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"

2
src/BlockEntities/ChestEntity.cpp
View File

@ -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"

2
src/BlockEntities/FurnaceEntity.cpp
View File

@ -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"

2
src/BlockEntities/JukeboxEntity.cpp
View File

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

2
src/BlockEntities/NoteEntity.cpp
View File

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

2
src/BlockEntities/SignEntity.cpp
View File

@ -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"

2
src/BlockID.cpp
View File

@ -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"

4
src/Chunk.cpp
View File

@ -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"

4
src/ChunkMap.cpp
View File

@ -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"

4
src/Entities/Player.cpp
View File

@ -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))

2
src/Generating/BioGen.cpp
View File

@ -5,7 +5,7 @@
#include "Globals.h"
#include "BioGen.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"
#include "../LinearUpscale.h"

2
src/Generating/ChunkGenerator.cpp
View File

@ -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"

2
src/Generating/CompoGen.cpp
View File

@ -12,7 +12,7 @@
#include "../BlockID.h"
#include "../Item.h"
#include "../LinearUpscale.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"

2
src/Generating/ComposableGenerator.cpp
View File

@ -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:

2
src/Generating/DistortedHeightmap.cpp
View File

@ -7,7 +7,7 @@
#include "DistortedHeightmap.h"
#include "../OSSupport/File.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"
#include "../LinearUpscale.h"

2
src/Generating/EndGen.cpp
View File

@ -5,7 +5,7 @@
#include "Globals.h"
#include "EndGen.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"
#include "../LinearUpscale.h"

2
src/Generating/HeiGen.cpp
View File

@ -6,7 +6,7 @@
#include "Globals.h"
#include "HeiGen.h"
#include "../LinearUpscale.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"

2
src/Generating/Noise3DGenerator.cpp
View File

@ -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"

2
src/GroupManager.cpp
View File

@ -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"

2
src/HTTPServer/HTTPServer.h
View File

@ -11,7 +11,7 @@
#include "../OSSupport/ListenThread.h"
#include "../OSSupport/SocketThreads.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"

2
src/Inventory.cpp
View File

@ -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"

2
src/Item.cpp
View File

@ -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"

2
src/LuaState.cpp
View File

@ -8,7 +8,7 @@
extern "C"
{
#include "lualib.h"
#include"lib/lua/src/lualib.h"
}
#include "tolua++.h"

2
src/LuaState.h
View File

@ -26,7 +26,7 @@ automatic resource management.
extern "C"
{
#include "lauxlib.h"
#include "../lib/lua/src/lauxlib.h"
}

2
src/LuaWindow.cpp
View File

@ -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

2
src/ManualBindings.cpp
View File

@ -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"

3
src/MonsterConfig.cpp
View File

@ -3,8 +3,7 @@
#include "MonsterConfig.h"
#include "Mobs/Monster.h"
#include "../iniFile/iniFile.h"
//#include <cstdio>
#include "../lib/inifile/iniFile.h"

2
src/OSSupport/GZipFile.h
View File

@ -9,7 +9,7 @@
#pragma once
#include "zlib.h"
#include "../lib/zlib/zlib.h"

2
src/PluginLua.cpp
View File

@ -11,7 +11,7 @@
extern "C"
{
#include "lualib.h"
#include"lib/lua/src/lualib.h"
}
#include "tolua++.h"

2
src/PluginManager.cpp
View File

@ -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"

2
src/Protocol/ChunkDataSerializer.cpp
View File

@ -7,7 +7,7 @@
#include "Globals.h"
#include "ChunkDataSerializer.h"
#include "zlib.h"
#include "../lib/zlib/zlib.h"

4
src/Protocol/Protocol132.cpp
View File

@ -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"

4
src/Protocol/Protocol132.h
View File

@ -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"

2
src/Protocol/Protocol14x.cpp
View File

@ -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"

4
src/Protocol/Protocol17x.h
View File

@ -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"

2
src/RCONServer.cpp
View File

@ -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"

2
src/Root.cpp
View File

@ -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>

4
src/Server.cpp
View File

@ -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"
}

4
src/Server.h
View File

@ -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"

2
src/Simulator/Simulator.h
View File

@ -2,7 +2,7 @@
#pragma once
#include "../Vector3i.h"
#include "../../iniFile/iniFile.h"
#include "../lib/inifile/iniFile.h"

2
src/StringCompression.h
View File

@ -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

2
src/WebAdmin.h
View File

@ -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"

2
src/World.cpp
View File

@ -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"

2
src/WorldStorage/WSSAnvil.cpp
View File

@ -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"

4
src/WorldStorage/WSSCompact.cpp
View File

@ -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"

2
src/WorldStorage/WorldStorage.h
View File

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

4
src/tolua++.h
View File

@ -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
{