Merge branch 'main' into mm-and-nlua

Author: Wartori54

.github/workflows/build-libs.yml

@@ -6,6 +6,7 @@ on:
       - .github/workflows/**
       - source/**
       - patches/**
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -139,23 +140,25 @@ jobs:
       if: ${{ matrix.platform == 'linux' }}
       run: echo "SDL2_LIB=${{ env.SDL2_DIR }}/lib/libSDL2-2.0.so" >> $GITHUB_ENV
 
-    # FNA3D + FAudio
-    - name: Update FNA3D + FAudio CMake version (Windows)
-      if: ${{ matrix.platform == 'windows' }}
-      run: |
-        # Update CMake to use CMAKE_MSVC_RUNTIME_LIBRARY
-        sed -i 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.16)/' source/FNA/lib/FNA3D/CMakeLists.txt
-        sed -i 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.16)/' source/FNA/lib/FAudio/CMakeLists.txt
-    
     # FNA3D  
-    - name: Patch FNA3D
+    - name: Patch FNA3D + MojoShader
       working-directory: source/FNA/lib/FNA3D
       run: |
         # Required for applying patches
-        git config user.name github-actions
-        git config user.email github-actions@github.com
+        git config --global user.name github-actions
+        git config --global user.email github-actions@github.com
         
         git am ../../../../patches/FNA3D_ExclusiveFullscreen.patch
+        git am ../../../../patches/FNA3D_Headless.patch
+
+        if [ "x${{ runner.os }}" = "xWindows" ]; then
+          # Update CMake to use CMAKE_MSVC_RUNTIME_LIBRARY
+          sed -i 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.16)/' CMakeLists.txt
+        fi
+
+        cd MojoShader
+        git am ../../../../../patches/MojoShader_Headless.patch
+        cd ..
 
     - name: Configure FNA3D
       working-directory: source/FNA/lib/FNA3D
@@ -171,6 +174,14 @@ jobs:
       run: cmake --build build --config ${{ env.BUILD_TYPE }} --verbose --parallel
 
     # FAudio
+    - name: Patch FAudio
+      working-directory: source/FNA/lib/FAudio
+      run: |
+        if [ "x${{ runner.os }}" = "xWindows" ]; then
+          # Update CMake to use CMAKE_MSVC_RUNTIME_LIBRARY
+          sed -i 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.16)/' CMakeLists.txt
+        fi
+
     - name: Configure FAudio
       working-directory: source/FNA/lib/FAudio
       run: cmake -B build -G Ninja \

README.md

@@ -1,6 +1,7 @@
-# Everest-libs
-## What is it for?
-This repository contains the latest libraries needed for Everest in answer to [this issue](https://github.com/EverestAPI/Everest/issues/720). In short: Everest bundled libraries are mismatched and could have been built anywhere, the purpose of this repository is to guarantee the provenance of the libs using Github Actions.
+# Everest Libraries
+
+Provides third-party libraries used by Everest, using trusted sources such as GitHub Actions or offical downloads to obtain them.
+Some libraries have patches applied to them, to account for Everest-specific needs.
 
 ## Libraries Versions
 
@@ -9,7 +10,7 @@ These libraries are open source and are built in CI.
 
 - SDL2 `2.28.5`
 - FNA `24.01`
-- FNA3D `24.01`
+- FNA3D `24.01` with patches
 - FAudio `24.01`
 - Theorafile [48d74af](https://github.com/FNA-XNA/Theorafile/tree/48d74afcbf838fe95ca56cec142efae07bb56f65)
 - MoltenVK `1.2.11`