diff --git a/external/sdl/CMakeLists.txt b/external/sdl/CMakeLists.txt index 5f7937ec..db1e8aac 100644 --- a/external/sdl/CMakeLists.txt +++ b/external/sdl/CMakeLists.txt @@ -16,7 +16,8 @@ if (NOT TARGET SDL3::SDL3) # made changes that break imgui release 1.90.6 #GIT_TAG 1103294d33f47ab4c697bb22a9cf27c79c658630 # tip 15-05-2024 #GIT_TAG aacafd62336363077470f678b6217214b3b49473 # tip 28-05-2024 - GIT_TAG 5fa9432b7d1c1722de93e1ab46e7a9569a47071e # tip 27-05-2024 - before changes made breaking sdl_image + #GIT_TAG 5fa9432b7d1c1722de93e1ab46e7a9569a47071e # tip 27-05-2024 - before changes made breaking sdl_image + GIT_TAG 9651ca59187c16079846918483c40d6b5c2f454c # tip 09-06-2024 FIND_PACKAGE_ARGS # for the future ) diff --git a/flake.lock b/flake.lock index 0dee75d9..c75f7339 100644 --- a/flake.lock +++ b/flake.lock @@ -63,17 +63,17 @@ "sdl3": { "flake": false, "locked": { - "lastModified": 1716778470, - "narHash": "sha256-/esw8XkLIR7/2HLXaCfsOsEy+Idf6XGsnWGC5yXJipk=", + "lastModified": 1717912334, + "narHash": "sha256-8ETnZUvAQusEnqm9a3uxud381deBHUIXWvta7JGF0ek=", "owner": "libsdl-org", "repo": "SDL", - "rev": "5fa9432b7d1c1722de93e1ab46e7a9569a47071e", + "rev": "9651ca59187c16079846918483c40d6b5c2f454c", "type": "github" }, "original": { "owner": "libsdl-org", "repo": "SDL", - "rev": "5fa9432b7d1c1722de93e1ab46e7a9569a47071e", + "rev": "9651ca59187c16079846918483c40d6b5c2f454c", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ac69efc8..0e540914 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ flake = false; }; sdl3 = { - url = "github:libsdl-org/SDL/5fa9432b7d1c1722de93e1ab46e7a9569a47071e"; # keep in sync this cmake + url = "github:libsdl-org/SDL/9651ca59187c16079846918483c40d6b5c2f454c"; # keep in sync this cmake flake = false; }; sdl3_image = { diff --git a/src/main.cpp b/src/main.cpp index f38e588e..80911c43 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -70,12 +70,7 @@ int main(int argc, char** argv) { } SDL_SetRenderVSync(renderer.get(), SDL_RENDERER_VSYNC_ADAPTIVE); - { - SDL_RendererInfo ri; - if (SDL_GetRendererInfo(renderer.get(), &ri) == 0) { - std::cout << "SDL Renderer: " << ri.name << "\n"; - } - } + std::cout << "SDL Renderer: " << SDL_GetRendererName(renderer.get()) << "\n"; IMGUI_CHECKVERSION(); ImGui::CreateContext();