From 4a56819bc301d0af54d32f8dbb4e2755ae6ec67a Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 1 Dec 2025 16:34:25 +0100 Subject: [PATCH] makefile: move openmpt stuff to before sdl stuff seems to fix linking openmpt without mixer for some reason oh well --- src/Makefile.d/features.mk | 2 +- src/Makefile.d/sdl.mk | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index b191ae2c1..dca2a7931 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -8,6 +8,7 @@ passthru_opts+=\ HAVE_MINIUPNPC\ HAVE_DISCORDRPC DEVELOP\ NOHOLEPUNCH\ + NOOPENMPT\ # build with debugging information ifdef DEBUGMODE @@ -91,7 +92,6 @@ endif default_packages:=\ LIBGME/libgme/LIBGME\ - OPENMPT/libopenmpt/LIBOPENMPT\ ZLIB/zlib\ $(foreach p,$(default_packages),\ diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk index 08be99029..8262ad9c6 100644 --- a/src/Makefile.d/sdl.mk +++ b/src/Makefile.d/sdl.mk @@ -29,6 +29,12 @@ ifndef NOHW sources+=sdl/ogl_sdl.c endif +ifndef NOOPENMPT +LIBOPENMPT_PKGCONFIG?=libopenmpt +$(eval $(call Use_pkg_config,LIBOPENMPT)) +opts+=-DHAVE_OPENMPT +endif + NOMIXER=1 ifdef NOMIXER