Compare commits
No commits in common. "2095bc6889b364caa1b56a9cc938bd31b2723bf0" and "fc2a10eb6a866b54c6fad75691a527de000550cc" have entirely different histories.
2095bc6889
...
fc2a10eb6a
5
external/sdl/CMakeLists.txt
vendored
5
external/sdl/CMakeLists.txt
vendored
@ -10,10 +10,7 @@ if (NOT TARGET SDL3::SDL3)
|
|||||||
FetchContent_Declare(SDL3
|
FetchContent_Declare(SDL3
|
||||||
GIT_REPOSITORY https://github.com/libsdl-org/SDL
|
GIT_REPOSITORY https://github.com/libsdl-org/SDL
|
||||||
#GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
|
#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
|
FIND_PACKAGE_ARGS # for the future
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(SDL3)
|
FetchContent_MakeAvailable(SDL3)
|
||||||
|
3
external/sdl_image/CMakeLists.txt
vendored
3
external/sdl_image/CMakeLists.txt
vendored
@ -15,8 +15,7 @@ if (NOT TARGET SDL3_image::SDL3_image)
|
|||||||
FetchContent_Declare(SDL3_image
|
FetchContent_Declare(SDL3_image
|
||||||
GIT_REPOSITORY https://github.com/libsdl-org/SDL_image
|
GIT_REPOSITORY https://github.com/libsdl-org/SDL_image
|
||||||
# waiting on the imgui pr to get merged so i can update sdl <.<
|
# waiting on the imgui pr to get merged so i can update sdl <.<
|
||||||
#GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check
|
GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check
|
||||||
GIT_TAG a34ccf16f961e6d5a480045eb650fc3dddb4bfaa # tip 14-05-2024
|
|
||||||
FIND_PACKAGE_ARGS # for the future
|
FIND_PACKAGE_ARGS # for the future
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(SDL3_image)
|
FetchContent_MakeAvailable(SDL3_image)
|
||||||
|
16
flake.lock
generated
16
flake.lock
generated
@ -63,34 +63,34 @@
|
|||||||
"sdl3": {
|
"sdl3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715616572,
|
"lastModified": 1714100414,
|
||||||
"narHash": "sha256-SCl7RbRThjci0xXUz9vmwDfqp0kenxEuuvoNlx6yiyU=",
|
"narHash": "sha256-eaiVG5WJoLnFvdpYBR+DF+YuMu5C3lA1SKuzN8+hfDM=",
|
||||||
"owner": "libsdl-org",
|
"owner": "libsdl-org",
|
||||||
"repo": "SDL",
|
"repo": "SDL",
|
||||||
"rev": "06d6f2cb2518622593570985589700910cf4399f",
|
"rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "libsdl-org",
|
"owner": "libsdl-org",
|
||||||
"repo": "SDL",
|
"repo": "SDL",
|
||||||
"rev": "06d6f2cb2518622593570985589700910cf4399f",
|
"rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sdl3_image": {
|
"sdl3_image": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715708273,
|
"lastModified": 1712700609,
|
||||||
"narHash": "sha256-scNPhzGk+d8VqkOKsSxmH/OVLgkWrOkEeWn/b2f3XaU=",
|
"narHash": "sha256-PVPH1uJ6g65SzHUboeQE6ZkC+72doMz9t9SG2LBo+7I=",
|
||||||
"owner": "libsdl-org",
|
"owner": "libsdl-org",
|
||||||
"repo": "SDL_image",
|
"repo": "SDL_image",
|
||||||
"rev": "a34ccf16f961e6d5a480045eb650fc3dddb4bfaa",
|
"rev": "a45d6e5b84ccc0f3faae6ba7d561709ed600eee7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "libsdl-org",
|
"owner": "libsdl-org",
|
||||||
"repo": "SDL_image",
|
"repo": "SDL_image",
|
||||||
"rev": "a34ccf16f961e6d5a480045eb650fc3dddb4bfaa",
|
"rev": "a45d6e5b84ccc0f3faae6ba7d561709ed600eee7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
sdl3 = {
|
sdl3 = {
|
||||||
url = "github:libsdl-org/SDL/06d6f2cb2518622593570985589700910cf4399f"; # keep in sync this cmake
|
url = "github:libsdl-org/SDL/14f584a94bfd49cf1524db75bf3c419fdf9436cd"; # keep in sync this cmake
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
sdl3_image = {
|
sdl3_image = {
|
||||||
url = "github:libsdl-org/SDL_image/a34ccf16f961e6d5a480045eb650fc3dddb4bfaa";
|
url = "github:libsdl-org/SDL_image/a45d6e5b84ccc0f3faae6ba7d561709ed600eee7";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user