From 86bfeec8bdd3fae373dbda21c0cc0947208b548d Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Tue, 27 Aug 2024 21:53:04 +0200
Subject: [PATCH] Fix compilation errors

---
 external/discord_rpc/.clang-format |  1 -
 src/backend/core/mmio/SI.cpp       | 14 ++++++++------
 src/frontend/CMakeLists.txt        |  1 +
 src/utils/File.hpp                 |  1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/external/discord_rpc/.clang-format b/external/discord_rpc/.clang-format
index 1be83906..0cceb2e1 100644
--- a/external/discord_rpc/.clang-format
+++ b/external/discord_rpc/.clang-format
@@ -45,7 +45,6 @@ IncludeCategories:
   - Regex: '.*'
     Priority: 3
 IncludeIsMainRegex: '(_test|_win|_linux|_mac|_ios|_osx|_null)?$'
-IndentCaseLabels: false
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
diff --git a/src/backend/core/mmio/SI.cpp b/src/backend/core/mmio/SI.cpp
index f72a41f8..95eaf44c 100644
--- a/src/backend/core/mmio/SI.cpp
+++ b/src/backend/core/mmio/SI.cpp
@@ -23,12 +23,14 @@ auto SI::Read(u32 addr) const -> u32 {
   case 0x0480000C:
     return 0;
   case 0x04800018:
-    u32 val = 0;
-    val |= status.dmaBusy;
-    val |= (0 << 1);
-    val |= (0 << 3);
-    val |= (mem.mmio.mi.miIntr.si << 12);
-    return val;
+    {
+      u32 val = 0;
+      val |= status.dmaBusy;
+      val |= (0 << 1);
+      val |= (0 << 3);
+      val |= (mem.mmio.mi.miIntr.si << 12);
+      return val;
+    }
   default:
     Util::panic("Unhandled SI[{:08X}] read", addr);
   }
diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt
index b96a6262..b206d04a 100644
--- a/src/frontend/CMakeLists.txt
+++ b/src/frontend/CMakeLists.txt
@@ -16,6 +16,7 @@ include_directories(
   ../backend/core/mmio/PIF
   ../backend/core/registers
   ../backend/core/rsp
+  ../../external
   ../../external/discord_rpc/include
   ../../external/xbyak
   ../../external/mio/include
diff --git a/src/utils/File.hpp b/src/utils/File.hpp
index aee00212..079656e8 100644
--- a/src/utils/File.hpp
+++ b/src/utils/File.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <fstream>
 #include <log.hpp>
+#include <vector>
 
 namespace Util {
 FORCE_INLINE std::vector<u8> ReadFileBinary(const std::string &path) {