Merge remote-tracking branch 'upstream/master' into develop

.github/workflows/build.yml

@@ -411,15 +411,10 @@ jobs:
       run: |
         ./premake5 gmake \
           --cc=clang \
-<<<<<<< HEAD
           --freetype-include-dir="/usr/local/include/freetype2" \
           --opus-include-dir="/usr/local/include/opus" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
-=======
-          --no-use-irrklang \
-          --freetype-include-dir="/usr/local/include/freetype2"
->>>>>>> 3aace69fd7bed29f44f40321b513be2a9a3ee45c
 
     - name: Use premake to generate make files (ARM64)
       if: runner.arch == 'ARM64'
@@ -431,7 +426,6 @@ jobs:
           --freetype-include-dir="/opt/homebrew/include/freetype2" \
           --freetype-lib-dir="/opt/homebrew/lib" \
           --sqlite-include-dir="/opt/homebrew/opt/sqlite/include" \
-<<<<<<< HEAD
           --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib" \
           --miniaudio-include-dir="/opt/homebrew/include" \
           --miniaudio-lib-dir="/opt/homebrew/lib" \
@@ -441,9 +435,6 @@ jobs:
           --vorbis-lib-dir="/opt/homebrew/lib" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
-=======
-          --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib"
->>>>>>> 3aace69fd7bed29f44f40321b513be2a9a3ee45c
 
     - name: Make
       run: |

premake/irrlicht/premake5.lua

@@ -67,8 +67,6 @@ project "irrlicht"
     files {
         "include/*.h",
         "source/Irrlicht/*.cpp",
-        "source/Irrlicht/lzma/*.h",
-        "source/Irrlicht/lzma/*.c",
         "source/Irrlicht/zlib/zlib.h",
         "source/Irrlicht/zlib/adler32.c",
         "source/Irrlicht/zlib/compress.c",