From 9871cf514ef4daa1234f1af88e2adde509607246 Mon Sep 17 00:00:00 2001 From: Andy Vandijck Date: Sat, 29 Mar 2025 20:09:20 +0100 Subject: [PATCH] Set up SDL3 in the script files Set up SDL3 in the script files --- cmake/Options.cmake | 2 +- default.nix | 4 ++-- src/wx/CMakeLists.txt | 6 +++--- tools/builder/MINGW.sh | 2 +- tools/builder/core.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 1c6ab427..99bdf053 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -29,7 +29,7 @@ endif() option(VBAM_STATIC "Try to link all libraries statically" ${VBAM_STATIC_DEFAULT}) if(VBAM_STATIC) - set(SDL2_STATIC ON) + set(SDL3_STATIC ON) set(SFML_STATIC_LIBRARIES ON) set(FFMPEG_STATIC ON) set(OPENAL_STATIC ON) diff --git a/default.nix b/default.nix index 76ce5423..14a6beb5 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ with import {}; stdenv.mkDerivation { name = "visualboyadvance-m"; buildInputs = if stdenv.isDarwin then - [ ninja cmake nasm faudio gettext libintl pkg-config zip zlib openal ffmpeg wxGTK32 SDL2 pcre pcre2 darwin.apple_sdk.frameworks.System darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.OpenAL llvmPackages_latest.clang llvmPackages_latest.bintools ] + [ ninja cmake nasm faudio gettext libintl pkg-config zip zlib openal ffmpeg wxGTK32 SDL3 pcre pcre2 darwin.apple_sdk.frameworks.System darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.OpenAL llvmPackages_latest.clang llvmPackages_latest.bintools ] else - [ ninja cmake gcc clang llvm llvmPackages.libcxx nasm faudio gettext libintl pkg-config zip zlib openal ffmpeg wxGTK32 libGL libGLU glfw SDL2 gtk3-x11 pcre pcre2 util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon libepoxy dbus at-spi2-core ]; + [ ninja cmake gcc clang llvm llvmPackages.libcxx nasm faudio gettext libintl pkg-config zip zlib openal ffmpeg wxGTK32 libGL libGLU glfw SDL3 gtk3-x11 pcre pcre2 util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon libepoxy dbus at-spi2-core ]; } diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 955735c6..60a97133 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -292,8 +292,8 @@ function(configure_wx_target target) _add_compile_definitions(NO_D3D) endif() - # SDL2. - _add_link_libraries(${VBAM_SDL2_LIBS}) + # SDL3. + _add_link_libraries(${VBAM_SDL3_LIBS}) # OpenGL. if(ENABLE_OPENGL) @@ -319,7 +319,7 @@ add_executable( ) target_sources(visualboyadvance-m PRIVATE ${VBAM_WX_COMMON} ${VBAM_ICON_PATH}) -target_include_directories(visualboyadvance-m PRIVATE ${SDL2_INCLUDE_DIRS}) +target_include_directories(visualboyadvance-m PRIVATE ${SDL3_INCLUDE_DIRS}) target_link_libraries( visualboyadvance-m diff --git a/tools/builder/MINGW.sh b/tools/builder/MINGW.sh index c0d4199e..4bd33929 100644 --- a/tools/builder/MINGW.sh +++ b/tools/builder/MINGW.sh @@ -334,7 +334,7 @@ table_line_append DIST_POST_BUILD libgsm ":; \ " table_line_append DIST_POST_BUILD ffmpeg ":; \ - sed -i.bak 's/-lSDL2main//g; s/-lstdc++//g; s/-lgcc_s//g; s/-lgcc//g; s/-lpthread//g' \$BUILD_ROOT/root/lib/pkgconfig/libav*.pc + sed -i.bak 's/-lstdc++//g; s/-lgcc_s//g; s/-lgcc//g; s/-lpthread//g' \$BUILD_ROOT/root/lib/pkgconfig/libav*.pc " table_line_append DIST_PRE_BUILD xvidcore ":; sed -i.bak 's/STATIC_LIB=\"xvidcore\\./STATIC_LIB=\"libxvidcore./; \ diff --git a/tools/builder/core.sh b/tools/builder/core.sh index 742b1ca7..710d13b8 100644 --- a/tools/builder/core.sh +++ b/tools/builder/core.sh @@ -177,7 +177,7 @@ DISTS=$DISTS' libgpg-error https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.45.tar.bz2 lib/libgpg-error.a libgcrypt https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.1.tar.bz2 lib/libgcrypt.a libsecret https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.20.5/libsecret-0.20.5.tar.bz2 lib/libsecret-1.a - sdl2 https://github.com/libsdl-org/SDL/releases/download/release-2.30.7/SDL2-2.30.7.tar.gz lib/libSDL2.a + sdl3 https://github.com/libsdl-org/SDL/releases/download/release-3.2.8/SDL3-3.2.8.tar.gz lib/libSDL3.a faudio https://github.com/FNA-XNA/FAudio/archive/refs/tags/24.09.tar.gz lib/libFAudio.a flac https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.4.tar.xz lib/libFLAC.a harfbuzz https://github.com/harfbuzz/harfbuzz/releases/download/10.0.1/harfbuzz-10.0.1.tar.xz lib/libharfbuzz.a