Merge branch 'master' into server

7317da36 · nanahira · 06f75a0c · 5b2831dc · 5a82befc · 7317da36
Commit 7317da36 authored Nov 03, 2025 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ocgcore ocgcore +1 -1

premake5.lua premake5.lua +1 -1

No files found.
--- a/ocgcore @ 5a82befc
+++ b/ocgcore @ 5a82befc
-Subproject commit 8dc2821cc2e4890a8eb79837ca0db38e8ed92761
+Subproject commit 5a82befc4962397f522a71dfa5e3f6893daaf6df
--- a/premake5.lua
+++ b/premake5.lua
@@ -409,7 +409,7 @@ if GetParam("ocgcore-dynamic") then
    OCGCORE_DYNAMIC = true
 end

-if OCGCORE_DYNAMIC then
+if OCGCORE_DYNAMIC or USE_AUDIO and AUDIO_LIB=='irrklang' and not IRRKLANG_PRO then
    USE_DYNAMIC = true
 end