saturn/SRB2Kart-Saturn
2
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 23 Wiki Activity

Revert "Provide our own SDL2 dll files"

Browse Source 
This reverts commit 91530c61ad.

i hate windows, i hate sdl breaking with every single update
This commit is contained in:
Alug committed 2025-11-30 14:37:00 +01:00
1 parent bb9a4a0da0
commit 31f01fd5da
7 files changed
+145 -150
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/SDL2/SRB2NOTE.txt
+15 -20
View File
@@ -1,20 +1,15 @@
# SDL Development Libaries # SDL Development Libaries
Download both the VC and MinGW packages and extract them here. Download both the VC and MinGW packages and extract them here.
https://www.libsdl.org/download-2.0.php https://www.libsdl.org/download-2.0.php
## VC Package ## VC Package
* include * include
* lib * lib
## MinGW Package ## MinGW Package
* i686-w64-mingw32 * i686-w64-mingw32
* x86_64-w64-mingw32 * x86_64-w64-mingw32
# SRB2Kart Saturn note:
Due to a good amount of issues with newer SDL releases, we decided to ship our own Version of the library.
This version is just the 2.28.5 release with a fix backported for non US keyboard layouts that prevented the right ALT GR key from working properly.
It can be found under: https://github.com/alufolie91/SDL/tree/backportaltgrfix
libs/SDL2/i686-w64-mingw32/bin/SDL2.dll
BIN
View File
Binary file not shown.
libs/SDL2/i686-w64-mingw32/bin/sdl2-config
+65 -65
View File
@@ -1,65 +1,65 @@
#!/bin/sh #!/bin/sh
# Get the canonical path of the folder containing this script # Get the canonical path of the folder containing this script
bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
# Calculate the canonical path of the prefix, relative to the folder of this script # Calculate the canonical path of the prefix, relative to the folder of this script
prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)")
exec_prefix=${prefix} exec_prefix=${prefix}
exec_prefix_set=no exec_prefix_set=no
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
#usage="\ #usage="\
#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" #Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
usage="\ usage="\
Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
if test $# -eq 0; then if test $# -eq 0; then
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
fi fi
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;; *) optarg= ;;
esac esac
case $1 in case $1 in
--prefix=*) --prefix=*)
prefix=$optarg prefix=$optarg
if test $exec_prefix_set = no ; then if test $exec_prefix_set = no ; then
exec_prefix=$optarg exec_prefix=$optarg
fi fi
;; ;;
--prefix) --prefix)
echo $prefix echo $prefix
;; ;;
--exec-prefix=*) --exec-prefix=*)
exec_prefix=$optarg exec_prefix=$optarg
exec_prefix_set=yes exec_prefix_set=yes
;; ;;
--exec-prefix) --exec-prefix)
echo $exec_prefix echo $exec_prefix
;; ;;
--version) --version)
echo 2.28.5 echo 2.28.5
;; ;;
--cflags) --cflags)
echo -I${prefix}/include/SDL2 -Dmain=SDL_main echo -I${prefix}/include/SDL2 -Dmain=SDL_main
;; ;;
--libs) --libs)
echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
;; ;;
--static-libs) --static-libs)
# --libs|--static-libs) # --libs|--static-libs)
sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g")
echo -L${exec_prefix}/lib $sdl_static_libs echo -L${exec_prefix}/lib $sdl_static_libs
;; ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
;; ;;
esac esac
shift shift
done done
libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll
BIN
View File
Binary file not shown.
libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config
+65 -65
View File
@@ -1,65 +1,65 @@
#!/bin/sh #!/bin/sh
# Get the canonical path of the folder containing this script # Get the canonical path of the folder containing this script
bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
# Calculate the canonical path of the prefix, relative to the folder of this script # Calculate the canonical path of the prefix, relative to the folder of this script
prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)")
exec_prefix=${prefix} exec_prefix=${prefix}
exec_prefix_set=no exec_prefix_set=no
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
#usage="\ #usage="\
#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" #Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
usage="\ usage="\
Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
if test $# -eq 0; then if test $# -eq 0; then
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
fi fi
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;; *) optarg= ;;
esac esac
case $1 in case $1 in
--prefix=*) --prefix=*)
prefix=$optarg prefix=$optarg
if test $exec_prefix_set = no ; then if test $exec_prefix_set = no ; then
exec_prefix=$optarg exec_prefix=$optarg
fi fi
;; ;;
--prefix) --prefix)
echo $prefix echo $prefix
;; ;;
--exec-prefix=*) --exec-prefix=*)
exec_prefix=$optarg exec_prefix=$optarg
exec_prefix_set=yes exec_prefix_set=yes
;; ;;
--exec-prefix) --exec-prefix)
echo $exec_prefix echo $exec_prefix
;; ;;
--version) --version)
echo 2.28.5 echo 2.28.5
;; ;;
--cflags) --cflags)
echo -I${prefix}/include/SDL2 -Dmain=SDL_main echo -I${prefix}/include/SDL2 -Dmain=SDL_main
;; ;;
--libs) --libs)
echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
;; ;;
--static-libs) --static-libs)
# --libs|--static-libs) # --libs|--static-libs)
sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g")
echo -L${exec_prefix}/lib $sdl_static_libs echo -L${exec_prefix}/lib $sdl_static_libs
;; ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
;; ;;
esac esac
shift shift
done done
libs/dll-binaries/i686/SDL2.dll
BIN
View File
Binary file not shown.
libs/dll-binaries/x86_64/SDL2.dll
BIN
View File
Binary file not shown.