summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--GNUmakefile3
-rw-r--r--VC2008/MCServer.vcproj26
-rw-r--r--lib/luaexpat/lxplib.c6
-rw-r--r--lib/sqlite/lsqlite3.c4
-rw-r--r--src/BlockEntities/ChestEntity.cpp2
-rw-r--r--src/BlockEntities/FurnaceEntity.cpp2
-rw-r--r--src/BlockEntities/JukeboxEntity.cpp2
-rw-r--r--src/BlockEntities/NoteEntity.cpp2
-rw-r--r--src/BlockEntities/SignEntity.cpp2
-rw-r--r--src/Chunk.cpp2
-rw-r--r--src/ChunkMap.cpp2
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/Inventory.cpp2
-rw-r--r--src/Item.cpp2
-rw-r--r--src/WorldStorage/WSSCompact.cpp2
-rw-r--r--src/WorldStorage/WorldStorage.h2
16 files changed, 31 insertions, 32 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a963da098..8c452c1cc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -143,9 +143,8 @@ endif
INCLUDE = -I.\
-Isrc\
- -Isrc/items\
- -Isrce/blocks\
-Ilib\
+ -Ilib/jsoncpp/include
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index f189da9d7..2a2ddb4ee 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+ AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+ AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -200,7 +200,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+ AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -277,7 +277,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="&quot;../lib/zlib&quot;;&quot;../lib/jsoncpp/include&quot;;&quot;../lib/lua/src&quot;;&quot;../lib/tolua++/include&quot;;..;../lib/expat"
+ AdditionalIncludeDirectories="&quot;../lib/jsoncpp/include&quot;;../lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -1220,6 +1220,14 @@
>
</File>
<File
+ RelativePath="..\src\Entities\ExpOrb.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Entities\ExpOrb.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Entities\FallingBlock.cpp"
>
</File>
@@ -1272,14 +1280,6 @@
>
</File>
<File
- RelativePath="..\src\Entities\ExpOrb.cpp"
- >
- </File>
- <File
- RelativePath="..\src\Entities\ExpOrb.h"
- >
- </File>
- <File
RelativePath="..\src\Entities\TNTEntity.cpp"
>
</File>
diff --git a/lib/luaexpat/lxplib.c b/lib/luaexpat/lxplib.c
index a81a434e9..1a36104a8 100644
--- a/lib/luaexpat/lxplib.c
+++ b/lib/luaexpat/lxplib.c
@@ -9,10 +9,10 @@
#include <stdlib.h>
#include <string.h>
-#include "lib/expat/expat.h"
+#include "expat/expat.h"
-#include "lib/lua/src/lua.h"
-#include "lib/lua/src/lauxlib.h"
+#include "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
#include "lxplib.h"
diff --git a/lib/sqlite/lsqlite3.c b/lib/sqlite/lsqlite3.c
index f896daf23..cf2c62597 100644
--- a/lib/sqlite/lsqlite3.c
+++ b/lib/sqlite/lsqlite3.c
@@ -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 "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
#if LUA_VERSION_NUM > 501
//
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 918a1df2d..dfbe6ae87 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 "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index 0123709bc..b1409f5cc 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 "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index b01d01391..33042179d 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -3,7 +3,7 @@
#include "JukeboxEntity.h"
#include "../World.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 0bae15777..9a33ead62 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -3,7 +3,7 @@
#include "NoteEntity.h"
#include "../World.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp
index 2e1fc1f8c..df8774377 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 "jsoncpp/include/json/json.h"
+#include "json/json.h"
#include "SignEntity.h"
#include "../Entities/Player.h"
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index c4aafaa8f..b3b24e339 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -34,7 +34,7 @@
#include "MobSpawner.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index c58b6b2fa..611e9f24e 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -21,7 +21,7 @@
#endif
#include "zlib/zlib.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index a27405839..910613e98 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -25,7 +25,7 @@
#include "../Vector3f.h"
#include "inifile/iniFile.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
#define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index b9c7f4aaf..a9b4ab9c5 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -9,7 +9,7 @@
#include "Root.h"
#include "World.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
#include "Items/ItemHandler.h"
diff --git a/src/Item.cpp b/src/Item.cpp
index 37277e8c8..196a260ef 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 "jsoncpp/include/json/json.h"
+#include "json/json.h"
#include "Items/ItemHandler.h"
diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp
index ced84836f..287938b24 100644
--- a/src/WorldStorage/WSSCompact.cpp
+++ b/src/WorldStorage/WSSCompact.cpp
@@ -7,7 +7,7 @@
#include "WSSCompact.h"
#include "../World.h"
#include "zlib/zlib.h"
-#include "jsoncpp/include/json/json.h"
+#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 720c04759..98e7e1686 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -16,7 +16,7 @@
#include "../ChunkDef.h"
#include "../OSSupport/IsThread.h"
-#include "jsoncpp/include/json/json.h"
+#include "json/json.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:47:01 +0100