flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Further attempts to fix compile

This commit is contained in:
Tiger Wang 2013-11-25 18:29:36 +00:00
parent e3db69c4ae
commit 32449f1fca
31 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VC2013/CryptoPP.vcxproj
View File

@ -814,6 +814,7 @@
<ClInclude Include="..\lib\cryptopp\des.h" />
<ClInclude Include="..\lib\cryptopp\dh.h" />
<ClInclude Include="..\lib\cryptopp\dh2.h" />
<ClInclude Include="..\lib\cryptopp\dll.h" />
<ClInclude Include="..\lib\cryptopp\dmac.h" />
<ClInclude Include="..\lib\cryptopp\dsa.h" />
<ClInclude Include="..\lib\cryptopp\eax.h" />
@ -824,6 +825,7 @@
<ClInclude Include="..\lib\cryptopp\emsa2.h" />
<ClInclude Include="..\lib\cryptopp\eprecomp.h" />
<ClInclude Include="..\lib\cryptopp\esign.h" />
<ClInclude Include="..\lib\cryptopp\factory.h" />
<ClInclude Include="..\lib\cryptopp\files.h" />
<ClInclude Include="..\lib\cryptopp\filters.h" />
<ClInclude Include="..\lib\cryptopp\fips140.h" />
@ -866,6 +868,7 @@
<ClInclude Include="..\lib\cryptopp\queue.h" />
<ClInclude Include="..\lib\cryptopp\rabin.h" />
<ClInclude Include="..\lib\cryptopp\randpool.h" />
<ClInclude Include="..\lib\cryptopp\resource.h" />
<ClInclude Include="..\lib\cryptopp\rijndael.h" />
<ClInclude Include="..\lib\cryptopp\rng.h" />
<ClInclude Include="..\lib\cryptopp\rsa.h" />
@ -888,6 +891,7 @@
<ClInclude Include="..\lib\cryptopp\trdlocal.h" />
<ClInclude Include="..\lib\cryptopp\trunhash.h" />
<ClInclude Include="..\lib\cryptopp\ttmac.h" />
<ClInclude Include="..\lib\cryptopp\validate.h" />
<ClInclude Include="..\lib\cryptopp\vmac.h" />
<ClInclude Include="..\lib\cryptopp\wait.h" />
<ClInclude Include="..\lib\cryptopp\wake.h" />

12
VC2013/CryptoPP.vcxproj.filters
View File

@ -580,6 +580,18 @@
<ClInclude Include="..\lib\cryptopp\words.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\cryptopp\dll.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\cryptopp\factory.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\cryptopp\resource.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\lib\cryptopp\validate.h">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\lib\cryptopp\Doxyfile">

4
VC2013/Lua.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">
@ -138,7 +138,7 @@
<ClCompile Include="..\lib\lua\src\ldebug.c" />
<ClCompile Include="..\lib\lua\src\ldo.c" />
<ClCompile Include="..\lib\lua\src\ldump.c" />
<ClCompile Include="..\lib\luaO\src\lfunc.c" />
<ClCompile Include="..\lib\lua\src\lfunc.c" />
<ClCompile Include="..\lib\lua\src\lgc.c" />
<ClCompile Include="..\lib\lua\src\linit.c" />
<ClCompile Include="..\lib\lua\src\liolib.c" />

4
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">
@ -85,7 +85,7 @@
<ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

6
lib/luaexpat/lxplib.c
View File

@ -9,10 +9,10 @@
#include <stdlib.h>
#include <string.h>
#include "../lib/expat/expat.h"
#include "lib/expat/expat.h"
#include "../lib/lua/src/lua.h"
#include "../lib/lua/src/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 "../lib/lua/src/lua.h"
#include "../lib/lua/src/lauxlib.h"
#include "lib/lua/src/lua.h"
#include "lib/lua/src/lauxlib.h"
#if LUA_VERSION_NUM > 501
//

4
lib/tolua++/include/tolua++.h
View File

@ -43,8 +43,8 @@ extern "C" {
typedef int lua_Object;
#include "lua.h"
#include "lauxlib.h"
#include "../../lua/src/lua.h
#include "../../lua/src/lauxlib.h"
struct tolua_Error
{

2
src/BlockEntities/ChestEntity.cpp
View File

@ -5,7 +5,7 @@
#include "../Item.h"
#include "../Entities/Player.h"
#include "../UI/Window.h"
#include "../lib/jsoncpp/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 "../lib/jsoncpp/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 "../lib/jsoncpp/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 "../lib/jsoncpp/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 "../lib/jsoncpp/include/json/json.h"
#include "lib/jsoncpp/include/json/json.h"
#include "SignEntity.h"
#include "../Entities/Player.h"

2
src/Generating/BioGen.cpp
View File

@ -5,7 +5,7 @@
#include "Globals.h"
#include "BioGen.h"
#include "../lib/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 "../lib/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 "../lib/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 "../lib/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 "../lib/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 "../lib/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 "../lib/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 "../lib/inifile/iniFile.h"
#include "lib/inifile/iniFile.h"
#include "../LinearInterpolation.h"
#include "../LinearUpscale.h"

2
src/HTTPServer/HTTPServer.h
View File

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

2
src/OSSupport/GZipFile.h
View File

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

2
src/Protocol/ChunkDataSerializer.cpp
View File

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

2
src/Protocol/Protocol132.cpp
View File

@ -5,12 +5,12 @@
#include "Globals.h"
#include "ChunkDataSerializer.h"
#include "lib/cryptopp/randpool.h"
#include "Protocol132.h"
#include "../Root.h"
#include "../Server.h"
#include "../World.h"
#include "../ClientHandle.h"
#include "../lib/cryptopp/randpool.h"
#include "../Item.h"
#include "../Entities/Player.h"
#include "../Mobs/Monster.h"

4
src/Protocol/Protocol132.h
View File

@ -10,8 +10,8 @@
#pragma once
#include "Protocol125.h"
#include "../lib/cryptopp/modes.h"
#include "../lib/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 "../lib/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 "../lib/cryptopp/modes.h"
#include "../lib/cryptopp/aes.h"
#include "lib/cryptopp/modes.h"
#include "lib/cryptopp/aes.h"

2
src/Simulator/Simulator.h
View File

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

2
src/WorldStorage/WSSAnvil.cpp
View File

@ -7,7 +7,7 @@
#include "WSSAnvil.h"
#include "NBTChunkSerializer.h"
#include "../World.h"
#include "../lib/zlib/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 "../lib/zlib/zlib.h"
#include "../lib/jsoncpp/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 "../lib/jsoncpp/include/json/json.h"
#include "lib/jsoncpp/include/json/json.h"