From 2095bc6889b364caa1b56a9cc938bd31b2723bf0 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 15 May 2024 14:06:31 +0200 Subject: [PATCH] update sdl --- external/sdl/CMakeLists.txt | 5 ++++- flake.lock | 8 ++++---- flake.nix | 3 +-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/external/sdl/CMakeLists.txt b/external/sdl/CMakeLists.txt index e2958896..2327684a 100644 --- a/external/sdl/CMakeLists.txt +++ b/external/sdl/CMakeLists.txt @@ -10,7 +10,10 @@ if (NOT TARGET SDL3::SDL3) FetchContent_Declare(SDL3 GIT_REPOSITORY https://github.com/libsdl-org/SDL #GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking - GIT_TAG 14f584a94bfd49cf1524db75bf3c419fdf9436cd # tip 26-04-2024 + #GIT_TAG 14f584a94bfd49cf1524db75bf3c419fdf9436cd # tip 26-04-2024 + GIT_TAG 06d6f2cb2518622593570985589700910cf4399f # 13-05-2024 - before + # made changes that break imgui release 1.90.6 + #GIT_TAG 1103294d33f47ab4c697bb22a9cf27c79c658630 # tip 15-05-2024 FIND_PACKAGE_ARGS # for the future ) FetchContent_MakeAvailable(SDL3) diff --git a/flake.lock b/flake.lock index 83a0c6a8..40539b7f 100644 --- a/flake.lock +++ b/flake.lock @@ -63,17 +63,17 @@ "sdl3": { "flake": false, "locked": { - "lastModified": 1714100414, - "narHash": "sha256-eaiVG5WJoLnFvdpYBR+DF+YuMu5C3lA1SKuzN8+hfDM=", + "lastModified": 1715616572, + "narHash": "sha256-SCl7RbRThjci0xXUz9vmwDfqp0kenxEuuvoNlx6yiyU=", "owner": "libsdl-org", "repo": "SDL", - "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd", + "rev": "06d6f2cb2518622593570985589700910cf4399f", "type": "github" }, "original": { "owner": "libsdl-org", "repo": "SDL", - "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd", + "rev": "06d6f2cb2518622593570985589700910cf4399f", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 454d251a..d1884b7b 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,10 @@ flake = false; }; sdl3 = { - url = "github:libsdl-org/SDL/14f584a94bfd49cf1524db75bf3c419fdf9436cd"; # keep in sync this cmake + url = "github:libsdl-org/SDL/06d6f2cb2518622593570985589700910cf4399f"; # keep in sync this cmake flake = false; }; sdl3_image = { - #url = "github:libsdl-org/SDL_image/a45d6e5b84ccc0f3faae6ba7d561709ed600eee7"; url = "github:libsdl-org/SDL_image/a34ccf16f961e6d5a480045eb650fc3dddb4bfaa"; flake = false; };