diff --git a/.gitignore b/.gitignore index 3a2e1c142..47d30c595 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ libstuff/libstuff.d libstuff/libstuff.h.gch .idea .clangd +.nfs* +.cache +compile_commands.json diff --git a/BedrockServer.cpp b/BedrockServer.cpp index 3d2108b59..84ae94d08 100644 --- a/BedrockServer.cpp +++ b/BedrockServer.cpp @@ -4,10 +4,8 @@ #include #include #include -#include #include #include -#include #include #include diff --git a/Makefile b/Makefile index aeb33f9b6..71a34084a 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ test/clustertest/testplugin/testplugin.so : $(TESTPLUGINOBJ) $(TESTPLUGINCPP) $( $(INTERMEDIATEDIR)/BedrockServer.d $(INTERMEDIATEDIR)/BedrockServer.o: BedrockServer.cpp $(CXX) $(CXXFLAGS) -MMD -MF $(INTERMEDIATEDIR)/BedrockServer.d -MT $(INTERMEDIATEDIR)/BedrockServer.o $(GIT_REVISION) -o $(INTERMEDIATEDIR)/BedrockServer.o -c BedrockServer.cpp -$(INTERMEDIATEDIR)/main.d $(INTERMEDIATEDIR)/main.o: main.cpp +$(INTERMEDIATEDIR)/main.d $(INTERMEDIATEDIR)/main.o: main.cpp $(INTERMEDIATEDIR) $(CXX) $(CXXFLAGS) -MMD -MF $(INTERMEDIATEDIR)/main.d -MT $(INTERMEDIATEDIR)/main.o $(GIT_REVISION) -o $(INTERMEDIATEDIR)/main.o -c main.cpp $(INTERMEDIATEDIR)/plugins/MySQL.d $(INTERMEDIATEDIR)/plugins/MySQL.o: plugins/MySQL.cpp