From 3045b35335113e5e5ba258858cb403d8803bfbeb Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 1 Jan 2026 12:14:23 -0800
Subject: [PATCH] Removed compile time assert about SDL version
This is handled in CMakeLists.txt and if it's not the correct version, the build will fail anyway.
---
build-scripts/test-versioning.sh | 13 -------------
src/SDL_mixer.c | 2 --
2 files changed, 15 deletions(-)
diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh
index ae89b98b0..84c9166a3 100755
--- a/build-scripts/test-versioning.sh
+++ b/build-scripts/test-versioning.sh
@@ -15,12 +15,6 @@ ref_minor=$(sed -ne 's/^#define SDL_MIXER_MINOR_VERSION *//p' $header)
ref_micro=$(sed -ne 's/^#define SDL_MIXER_MICRO_VERSION *//p' $header)
ref_version="${ref_major}.${ref_minor}.${ref_micro}"
-ref_reqsdl="$(sed -nEe ':a;N;$!ba;s/[\r\n]/ /g;s/.*SDL_COMPILE_TIME_ASSERT\(SDL_version, SDL_VERSION_ATLEAST\(([0-9]+), ([0-9]+), ([0-9]+)\)\).*/\1.\2.\3/p' src/SDL_mixer.c)"
-if [[ -z "$ref_reqsdl" ]]; then
- echo "ERROR: SDL_VERSION_ATLEAST(...) not found in $src" >&2
- exit 1
-fi
-
tests=0
failed=0
@@ -38,7 +32,6 @@ not_ok () {
major=$(sed -ne 's/^set(MAJOR_VERSION \([0-9]*\))$/\1/p' CMakeLists.txt)
minor=$(sed -ne 's/^set(MINOR_VERSION \([0-9]*\))$/\1/p' CMakeLists.txt)
micro=$(sed -ne 's/^set(MICRO_VERSION \([0-9]*\))$/\1/p' CMakeLists.txt)
-reqsdl=$(sed -ne 's/^set(SDL_REQUIRED_VERSION \([0-9.]*\))$/\1/p' CMakeLists.txt)
version="${major}.${minor}.${micro}"
if [ "$ref_version" = "$version" ]; then
@@ -47,12 +40,6 @@ else
not_ok "CMakeLists.txt $version disagrees with SDL_mixer.h $ref_version"
fi
-if [ "$ref_reqsdl" = "$reqsdl" ]; then
- ok "CMakeLists.txt $reqsdl"
-else
- not_ok "CMakeLists.txt $reqsdl disagrees with SDL_mixer.h $ref_reqsdl"
-fi
-
for rcfile in src/version.rc; do
tuple=$(sed -ne 's/^ *FILEVERSION *//p' "$rcfile" | tr -d '\r')
ref_tuple="${ref_major},${ref_minor},${ref_micro},0"
diff --git a/src/SDL_mixer.c b/src/SDL_mixer.c
index 4b0b510a2..e09eadc70 100644
--- a/src/SDL_mixer.c
+++ b/src/SDL_mixer.c
@@ -23,8 +23,6 @@
#include "SDL_mixer_internal.h"
-SDL_COMPILE_TIME_ASSERT(SDL_version, SDL_VERSION_ATLEAST(3, 3, 3));
-
// !!! FIXME: should RAW go first (only needs to check if it was explicitly
// !!! FIXME: requested), and SINEWAVE last (must be requested, likely rare).
static const MIX_Decoder *decoders[] = {