Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

update and port sdl

Browse Source
This commit is contained in:
Green Sky 2024-06-09 10:35:09 +02:00
parent 727f33ae82
commit 41c83619b5
No known key found for this signature in database
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/sdl/CMakeLists.txt vendored
View File

@ -16,7 +16,8 @@ if (NOT TARGET SDL3::SDL3)
# made changes that break imgui release 1.90.6 # made changes that break imgui release 1.90.6
#GIT_TAG 1103294d33f47ab4c697bb22a9cf27c79c658630 # tip 15-05-2024 #GIT_TAG 1103294d33f47ab4c697bb22a9cf27c79c658630 # tip 15-05-2024
#GIT_TAG aacafd62336363077470f678b6217214b3b49473 # tip 28-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 FIND_PACKAGE_ARGS # for the future
) )

8
flake.lock generated
View File

@ -63,17 +63,17 @@
"sdl3": { "sdl3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716778470, "lastModified": 1717912334,
"narHash": "sha256-/esw8XkLIR7/2HLXaCfsOsEy+Idf6XGsnWGC5yXJipk=", "narHash": "sha256-8ETnZUvAQusEnqm9a3uxud381deBHUIXWvta7JGF0ek=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "5fa9432b7d1c1722de93e1ab46e7a9569a47071e", "rev": "9651ca59187c16079846918483c40d6b5c2f454c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "5fa9432b7d1c1722de93e1ab46e7a9569a47071e", "rev": "9651ca59187c16079846918483c40d6b5c2f454c",
"type": "github" "type": "github"
} }
}, },

2
flake.nix
View File

@ -12,7 +12,7 @@
flake = false; flake = false;
}; };
sdl3 = { 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; flake = false;
}; };
sdl3_image = { sdl3_image = {

7
src/main.cpp
View File

@ -70,12 +70,7 @@ int main(int argc, char** argv) {
} }
SDL_SetRenderVSync(renderer.get(), SDL_RENDERER_VSYNC_ADAPTIVE); SDL_SetRenderVSync(renderer.get(), SDL_RENDERER_VSYNC_ADAPTIVE);
{ std::cout << "SDL Renderer: " << SDL_GetRendererName(renderer.get()) << "\n";
SDL_RendererInfo ri;
if (SDL_GetRendererInfo(renderer.get(), &ri) == 0) {
std::cout << "SDL Renderer: " << ri.name << "\n";
}
}
IMGUI_CHECKVERSION(); IMGUI_CHECKVERSION();
ImGui::CreateContext(); ImGui::CreateContext();