diff options
Diffstat (limited to '')
| -rw-r--r-- | VC2008/MCServer.sln | 9 | ||||
| -rw-r--r-- | VC2008/MCServer.vcproj | 56 | ||||
| -rw-r--r-- | VC2008/Squirrel3.vcproj | 322 | ||||
| -rw-r--r-- | VC2010/MCServer.vcxproj | 4 | ||||
| -rw-r--r-- | VC2010/MCServer.vcxproj.filters | 4 | ||||
| -rw-r--r-- | makefile_base | 8 | ||||
| -rw-r--r-- | source/AllToLua.pkg | 2 | ||||
| -rw-r--r-- | source/Bindings.cpp | 2 | ||||
| -rw-r--r-- | source/BlockArea.cpp (renamed from source/cBlockArea.cpp) | 2 | ||||
| -rw-r--r-- | source/BlockArea.h (renamed from source/cBlockArea.h) | 0 | ||||
| -rw-r--r-- | source/cChunk.cpp | 2 | ||||
| -rw-r--r-- | source/squirrelbindings/cSquirrelBaseClass.h | 2 |
12 files changed, 386 insertions, 27 deletions
diff --git a/VC2008/MCServer.sln b/VC2008/MCServer.sln index 6cafa6558..0bce96238 100644 --- a/VC2008/MCServer.sln +++ b/VC2008/MCServer.sln @@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcproj {082E8185-7B3A-4945-8C82-9132341A329D} = {082E8185-7B3A-4945-8C82-9132341A329D}
{EEAB54AD-114C-4AB8-8482-0A52D502BD35} = {EEAB54AD-114C-4AB8-8482-0A52D502BD35}
{5AAA90B9-946D-4034-83F3-676B06A6E326} = {5AAA90B9-946D-4034-83F3-676B06A6E326}
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C} = {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}
{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}
EndProjectSection
EndProject
@@ -20,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToLua", "ToLua.vcproj", "{E EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebServer", "WebServer.vcproj", "{9A476537-42C0-4848-AB40-15CFE83D17A8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Squirrel3", "Squirrel3.vcproj", "{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -63,6 +66,12 @@ Global {9A476537-42C0-4848-AB40-15CFE83D17A8}.Release profiled|Win32.Build.0 = Release profiled|Win32
{9A476537-42C0-4848-AB40-15CFE83D17A8}.Release|Win32.ActiveCfg = Release|Win32
{9A476537-42C0-4848-AB40-15CFE83D17A8}.Release|Win32.Build.0 = Release|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Debug|Win32.Build.0 = Debug|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release profiled|Win32.ActiveCfg = Release|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release profiled|Win32.Build.0 = Release|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release|Win32.ActiveCfg = Release|Win32
+ {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 8c47ec37e..420bf2f5a 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+ AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+ AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -192,7 +192,7 @@ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+ AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -1621,7 +1621,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="GenerateBindings.cmd"
+ 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""
Outputs="Bindings.cpp"
/>
@@ -1632,7 +1632,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="GenerateBindings.cmd"
+ 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""
Outputs="Bindings.cpp"
/>
@@ -1643,7 +1643,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="GenerateBindings.cmd"
+ 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""
Outputs="Bindings.cpp"
/>
@@ -1722,6 +1722,14 @@ >
</File>
<File
+ RelativePath="..\source\cPlugin_Squirrel.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\cPlugin_Squirrel.h"
+ >
+ </File>
+ <File
RelativePath="..\source\cPluginManager.cpp"
>
</File>
@@ -1762,14 +1770,6 @@ >
</File>
<File
- RelativePath="..\source\SquirrelBindings.cpp"
- >
- </File>
- <File
- RelativePath="..\source\SquirrelBindings.h"
- >
- </File>
- <File
RelativePath="..\source\tolua++.h"
>
</File>
@@ -1777,6 +1777,34 @@ RelativePath="..\source\tolua_base.h"
>
</File>
+ <Filter
+ Name="Squirrel"
+ >
+ <File
+ RelativePath="..\source\squirrelbindings\cSquirrelBaseClass.h"
+ >
+ </File>
+ <File
+ RelativePath="..\source\squirrelbindings\SquirrelBindings.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\squirrelbindings\SquirrelBindings.h"
+ >
+ </File>
+ <File
+ RelativePath="..\source\squirrelbindings\SquirrelFunctions.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\squirrelbindings\SquirrelFunctions.h"
+ >
+ </File>
+ <File
+ RelativePath="..\source\squirrelbindings\SquirrelObject.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="External"
diff --git a/VC2008/Squirrel3.vcproj b/VC2008/Squirrel3.vcproj new file mode 100644 index 000000000..11bdd953b --- /dev/null +++ b/VC2008/Squirrel3.vcproj @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="Squirrel3"
+ ProjectGUID="{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}"
+ RootNamespace="Squirrel3"
+ Keyword="ManagedCProj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ ManagedExtensions="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\squirrel_3_0_1_stable\include"
+ PreprocessorDefinitions="WIN32;_DEBUG"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ ManagedExtensions="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ <AssemblyReference
+ RelativePath="System.dll"
+ AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="System.Data.dll"
+ AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="System.XML.dll"
+ AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ </References>
+ <Files>
+ <Filter
+ Name="sqstdlib"
+ >
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdaux.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdblob.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdblobimpl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdio.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdmath.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdrex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstream.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstream.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstring.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdsystem.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="squirrel"
+ >
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqapi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqarray.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqbaselib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclass.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclass.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclosure.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqcompiler.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqcompiler.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqdebug.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncproto.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncstate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncstate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqlexer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqlexer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqmem.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqobject.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqobject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqopcodes.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqpcheader.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstring.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqtable.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqtable.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\squserdata.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\squtils.h"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqvm.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\squirrel_3_0_1_stable\squirrel\sqvm.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj index a75974183..06fc9aa6e 100644 --- a/VC2010/MCServer.vcxproj +++ b/VC2010/MCServer.vcxproj @@ -303,10 +303,10 @@ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\source\BioGen.cpp" />
+ <ClCompile Include="..\source\BlockArea.cpp" />
<ClCompile Include="..\source\BlockID.cpp" />
<ClCompile Include="..\source\cAggressiveMonster.cpp" />
<ClCompile Include="..\Source\cAuthenticator.cpp" />
- <ClCompile Include="..\source\cBlockArea.cpp" />
<ClCompile Include="..\source\cBlockingTCPLink.cpp" />
<ClCompile Include="..\source\cCavespider.cpp" />
<ClCompile Include="..\Source\cChicken.cpp" />
@@ -495,10 +495,10 @@ </ItemGroup>
<ItemGroup>
<ClInclude Include="..\source\BioGen.h" />
+ <ClInclude Include="..\source\BlockArea.h" />
<ClInclude Include="..\Source\BlockID.h" />
<ClInclude Include="..\source\cAggressiveMonster.h" />
<ClInclude Include="..\Source\cAuthenticator.h" />
- <ClInclude Include="..\source\cBlockArea.h" />
<ClInclude Include="..\source\cBlockingTCPLink.h" />
<ClInclude Include="..\source\cCavespider.h" />
<ClInclude Include="..\Source\cChicken.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters index 1793d9b49..1e1dc15d9 100644 --- a/VC2010/MCServer.vcxproj.filters +++ b/VC2010/MCServer.vcxproj.filters @@ -904,7 +904,6 @@ <Filter>Storage</Filter>
</ClCompile>
<ClCompile Include="..\source\CraftingRecipes.cpp" />
- <ClCompile Include="..\source\cBlockArea.cpp" />
<ClCompile Include="..\source\squirrelbindings\SquirrelBindings.cpp">
<Filter>LuaBindings\SquirrelBindings</Filter>
</ClCompile>
@@ -914,6 +913,7 @@ <ClCompile Include="..\source\squirrelbindings\SquirrelFunctions.cpp">
<Filter>LuaBindings\SquirrelBindings</Filter>
</ClCompile>
+ <ClCompile Include="..\source\BlockArea.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\source\cServer.h">
@@ -1421,7 +1421,6 @@ </ClInclude>
<ClInclude Include="..\source\cStep.h" />
<ClInclude Include="..\source\CraftingRecipes.h" />
- <ClInclude Include="..\source\cBlockArea.h" />
<ClInclude Include="..\source\squirrelbindings\SquirrelBindings.h">
<Filter>LuaBindings\SquirrelBindings</Filter>
</ClInclude>
@@ -1437,6 +1436,7 @@ <ClInclude Include="..\source\squirrelbindings\cSquirrelBaseClass.h">
<Filter>LuaBindings\SquirrelBindings</Filter>
</ClInclude>
+ <ClInclude Include="..\source\BlockArea.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\source\AllToLua.pkg">
diff --git a/makefile_base b/makefile_base index 5560256da..71828e411 100644 --- a/makefile_base +++ b/makefile_base @@ -69,7 +69,7 @@ MCServer : \ build/cReferenceManager.o\ build/Bindings.o\ build/BlockID.o\ - build/cBlockArea.o\ + build/BlockArea.o\ build/cBlockToPickup.o\ build/cChatColor.o\ build/cChestEntity.o\ @@ -317,7 +317,7 @@ MCServer : \ build/cReferenceManager.o\ build/Bindings.o\ build/BlockID.o\ - build/cBlockArea.o\ + build/BlockArea.o\ build/cBlockToPickup.o\ build/cChatColor.o\ build/cChestEntity.o\ @@ -810,8 +810,8 @@ build/Bindings.o : source/Bindings.cpp build/BlockID.o : source/BlockID.cpp $(CC) $(CC_OPTIONS) source/BlockID.cpp -c $(INCLUDE) -o build/BlockID.o -build/cBlockArea.o : source/cBlockArea.cpp - $(CC) $(CC_OPTIONS) source/cBlockArea.cpp -c $(INCLUDE) -o build/cBlockArea.o +build/BlockArea.o : source/BlockArea.cpp + $(CC) $(CC_OPTIONS) source/BlockArea.cpp -c $(INCLUDE) -o build/BlockArea.o # Item # 6 -- cBlockToPickup -- diff --git a/source/AllToLua.pkg b/source/AllToLua.pkg index 4e4cfb4b5..b6ee64579 100644 --- a/source/AllToLua.pkg +++ b/source/AllToLua.pkg @@ -45,7 +45,7 @@ $cfile "cCuboid.h" $cfile "cMCLogger.h" $cfile "cTracer.h" $cfile "cGroup.h" -$cfile "cBlockArea.h" +$cfile "BlockArea.h" $cfile "packets/cPacket_Login.h" $cfile "packets/cPacket_BlockDig.h" $cfile "packets/cPacket_BlockPlace.h" diff --git a/source/Bindings.cpp b/source/Bindings.cpp index 772013b25..cabd19661 100644 --- a/source/Bindings.cpp +++ b/source/Bindings.cpp @@ -54,7 +54,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S); #include "cMCLogger.h" #include "cTracer.h" #include "cGroup.h" -#include "cBlockArea.h" +#include "BlockArea.h" #include "packets/cPacket_Login.h" #include "packets/cPacket_BlockDig.h" #include "packets/cPacket_BlockPlace.h" diff --git a/source/cBlockArea.cpp b/source/BlockArea.cpp index 810503f04..7750b94fb 100644 --- a/source/cBlockArea.cpp +++ b/source/BlockArea.cpp @@ -5,7 +5,7 @@ // The object also supports writing the blockdata back into cWorld, even into other coords
#include "Globals.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
#include "cWorld.h"
diff --git a/source/cBlockArea.h b/source/BlockArea.h index 5abdab3bb..5abdab3bb 100644 --- a/source/cBlockArea.h +++ b/source/BlockArea.h diff --git a/source/cChunk.cpp b/source/cChunk.cpp index 489af5cc9..cd94e3413 100644 --- a/source/cChunk.cpp +++ b/source/cChunk.cpp @@ -27,7 +27,7 @@ #include "cBlockToPickup.h" #include "MersenneTwister.h" #include "cPlayer.h" -#include "cBlockArea.h" +#include "BlockArea.h" #include "cPluginManager.h" #include "packets/cPacket_DestroyEntity.h" diff --git a/source/squirrelbindings/cSquirrelBaseClass.h b/source/squirrelbindings/cSquirrelBaseClass.h index e06301555..a66ca7ddd 100644 --- a/source/squirrelbindings/cSquirrelBaseClass.h +++ b/source/squirrelbindings/cSquirrelBaseClass.h @@ -2,7 +2,7 @@ #include "SquirrelBindings.h"
#include "../cPlugin_Squirrel.h"
#include "../cPluginManager.h"
-#include "cRoot.h"
+#include "../cRoot.h"
//The baseclass for squirrel plugins
class cSquirrelBaseClass
|