Mercurial > hg > ascension / file diff

--- a/configure	Tue Aug 05 16:53:25 2025 +0200
+++ b/configure	Tue Aug 05 20:00:24 2025 +0200
@@ -299,30 +299,6 @@
     fi
 }
 
-dependency_error_sdl2_ttf()
-{
-    print_check_msg "$dep_checked_sdl2_ttf" "checking for sdl2_ttf... "
-    # dependency sdl2_ttf
-    while true
-    do
-        if [ -z "$PKG_CONFIG" ]; then
-            break
-        fi
-        if test_pkg_config "SDL2_ttf" "" "" "" ; then
-            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags SDL2_ttf`"
-            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs SDL2_ttf`"
-        else
-            break
-        fi
-        print_check_msg "$dep_checked_sdl2_ttf" "yes\n"
-        dep_checked_sdl2_ttf=1
-        return 1
-    done
-
-    print_check_msg "$dep_checked_sdl2_ttf" "no\n"
-    dep_checked_sdl2_ttf=1
-    return 0
-}
 dependency_error_asan()
 {
     print_check_msg "$dep_checked_asan" "checking for asan... "
@@ -343,52 +319,28 @@
     dep_checked_asan=1
     return 0
 }
-dependency_error_sdl2()
+dependency_error_sdl3_ttf()
 {
-    print_check_msg "$dep_checked_sdl2" "checking for sdl2... "
-    # dependency sdl2
+    print_check_msg "$dep_checked_sdl3_ttf" "checking for sdl3_ttf... "
+    # dependency sdl3_ttf
     while true
     do
         if [ -z "$PKG_CONFIG" ]; then
             break
         fi
-        if test_pkg_config "sdl2" "" "" "" ; then
-            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags sdl2`"
-            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs sdl2`"
+        if test_pkg_config "sdl3-ttf" "" "" "" ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags sdl3-ttf`"
+            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs sdl3-ttf`"
         else
             break
         fi
-        print_check_msg "$dep_checked_sdl2" "yes\n"
-        dep_checked_sdl2=1
+        print_check_msg "$dep_checked_sdl3_ttf" "yes\n"
+        dep_checked_sdl3_ttf=1
         return 1
     done
 
-    print_check_msg "$dep_checked_sdl2" "no\n"
-    dep_checked_sdl2=1
-    return 0
-}
-dependency_error_sdl2_image()
-{
-    print_check_msg "$dep_checked_sdl2_image" "checking for sdl2_image... "
-    # dependency sdl2_image
-    while true
-    do
-        if [ -z "$PKG_CONFIG" ]; then
-            break
-        fi
-        if test_pkg_config "SDL2_image" "" "" "" ; then
-            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags SDL2_image`"
-            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs SDL2_image`"
-        else
-            break
-        fi
-        print_check_msg "$dep_checked_sdl2_image" "yes\n"
-        dep_checked_sdl2_image=1
-        return 1
-    done
-
-    print_check_msg "$dep_checked_sdl2_image" "no\n"
-    dep_checked_sdl2_image=1
+    print_check_msg "$dep_checked_sdl3_ttf" "no\n"
+    dep_checked_sdl3_ttf=1
     return 0
 }
 dependency_error_glew()
@@ -415,6 +367,30 @@
     dep_checked_glew=1
     return 0
 }
+dependency_error_sdl3_image()
+{
+    print_check_msg "$dep_checked_sdl3_image" "checking for sdl3_image... "
+    # dependency sdl3_image
+    while true
+    do
+        if [ -z "$PKG_CONFIG" ]; then
+            break
+        fi
+        if test_pkg_config "sdl3-image" "" "" "" ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags sdl3-image`"
+            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs sdl3-image`"
+        else
+            break
+        fi
+        print_check_msg "$dep_checked_sdl3_image" "yes\n"
+        dep_checked_sdl3_image=1
+        return 1
+    done
+
+    print_check_msg "$dep_checked_sdl3_image" "no\n"
+    dep_checked_sdl3_image=1
+    return 0
+}
 dependency_error_ucx()
 {
     print_check_msg "$dep_checked_ucx" "checking for ucx... "
@@ -436,6 +412,30 @@
     dep_checked_ucx=1
     return 0
 }
+dependency_error_sdl3()
+{
+    print_check_msg "$dep_checked_sdl3" "checking for sdl3... "
+    # dependency sdl3
+    while true
+    do
+        if [ -z "$PKG_CONFIG" ]; then
+            break
+        fi
+        if test_pkg_config "sdl3" "" "" "" ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags sdl3`"
+            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs sdl3`"
+        else
+            break
+        fi
+        print_check_msg "$dep_checked_sdl3" "yes\n"
+        dep_checked_sdl3=1
+        return 1
+    done
+
+    print_check_msg "$dep_checked_sdl3" "no\n"
+    dep_checked_sdl3=1
+    return 0
+}
 
 # start collecting dependency information
 echo > "$TEMP_DIR/flags.mk"
@@ -505,16 +505,16 @@
     DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ucx "
     ERROR=1
 fi
-if dependency_error_sdl2; then
-    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl2 "
+if dependency_error_sdl3; then
+    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl3 "
     ERROR=1
 fi
-if dependency_error_sdl2_ttf; then
-    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl2_ttf "
+if dependency_error_sdl3_ttf; then
+    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl3_ttf "
     ERROR=1
 fi
-if dependency_error_sdl2_image; then
-    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl2_image "
+if dependency_error_sdl3_image; then
+    DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sdl3_image "
     ERROR=1
 fi
 if dependency_error_glew; then