Merge pull request #1860 from Expensify/main

Update expensify_prod branch
Expensify · Sep 2, 2024 · 785930d · 785930d
2 parents 786052a + 3156f8b
commit 785930d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -4,10 +4,8 @@
 #include <arpa/inet.h>
 #include <cstring>
 #include <fstream>
-#include <iomanip>
 #include <sys/resource.h>
 #include <sys/time.h>
-#include <signal.h>
 
 #include <bedrockVersion.h>
 #include <BedrockCore.h>

diff --git 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