From 1cf72265cd31a15a8c6afce140463dac9917b9fb Mon Sep 17 00:00:00 2001
From: Tillsunset <35825944+Tillsunset@users.noreply.github.com>
Date: Thu, 5 Jan 2023 20:46:10 -0600
Subject: [PATCH] Update to llvm15 (#594)

---
 .github/workflows/build.yml | 11 ++++++++---
 BUILD.md                    |  8 +++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b7719ac..ef1de2d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -180,7 +180,6 @@ jobs:
         name: cemu-bin-windows-x64
         path: ./bin/Cemu.exe
 
-
   build-macos:
     runs-on: macos-12
     steps:
@@ -209,7 +208,7 @@ jobs:
         
     - name: "Install system dependencies"
       run: |
-        brew install llvm@14 ninja nasm molten-vk
+        brew install llvm ninja nasm molten-vk
     - name: "Bootstrap vcpkg"
       run: |
         bash ./dependencies/vcpkg/bootstrap-vcpkg.sh
@@ -232,7 +231,13 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DPORTABLE=OFF -DMACOS_BUNDLE=ON -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja
+        cmake .. ${{ env.BUILD_FLAGS }} \
+        -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} \
+        -DPORTABLE=OFF \
+        -DMACOS_BUNDLE=ON \
+        -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
+        -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
+        -G Ninja
         
     - name: "Build Cemu"
       run: |
diff --git a/BUILD.md b/BUILD.md
index 76cb06c3..b626f33a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -67,8 +67,7 @@ You can use GCC by doing the following:
 ## macOS
 
 To compile Cemu, a recent enough compiler and STL with C++20 support is required! LLVM 13 and 
-below, built in LLVM, and Xcode LLVM don't support the C++20 feature set required. Currently, 
-LLVM 15 isn't supported due to compatibility issues with Boost dependency. The OpenGL graphics
+below, built in LLVM, and Xcode LLVM don't support the C++20 feature set required. The OpenGL graphics
 API isn't support on macOS, Vulkan must be used. Additionally Vulkan must be used through the 
 Molten-VK compatibility layer
 
@@ -86,13 +85,12 @@ You can skip this section if you have an Intel Mac. Every time you compile, you
 
 ### Installing dependencies
 
-`brew install boost git cmake llvm@14 ninja nasm molten-vk`
+`brew install boost git cmake llvm ninja nasm molten-vk`
 
 ### Build Cemu using cmake and clang
 1. `git clone --recursive https://github.com/cemu-project/Cemu`
 2. `cd Cemu`
-3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release
-   -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja`
+3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ -G Ninja`
 4. `cmake --build build`
 5. You should now have a Cemu executable file in the /bin folder, which you can run using `./bin/Cemu_release`.