[Scummvm-git-logs] scummvm master -> 46c37c4ded8634b08c682a9b994e68ecaa45f80e

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
46c37c4ded MACOS: Let static build work with either libsonivox-static.a or libsonivox.a


Commit: 46c37c4ded8634b08c682a9b994e68ecaa45f80e
    https://github.com/scummvm/scummvm/commit/46c37c4ded8634b08c682a9b994e68ecaa45f80e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-03-24T09:01:38+01:00

Commit Message:
MACOS: Let static build work with either libsonivox-static.a or libsonivox.a

When upgrading to Sonivox v4, it now produces a (regular) libsonivox.a,
instead of the more exotic libsonivox-static.a name.

Handle both, since we're already doing so in the configure script.

Syntax similar to commit cb28ad482cf37854e4cd7570b9db5b808d631351.

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index d5ddc1730f6..b50dbc88ae8 100644
--- a/ports.mk
+++ b/ports.mk
@@ -592,7 +592,11 @@ OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libRetroWave.a
 endif
 
 ifdef USE_SONIVOX
+ifneq (,$(wildcard $(STATICLIBPATH)/lib/libsonivox-static.a))
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libsonivox-static.a
+else
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libsonivox.a
+endif
 endif
 
 ifdef USE_SPARKLE