Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update imgui to 1.87-WIP #325

Merged
merged 2 commits into from
Feb 13, 2022
Merged

Update imgui to 1.87-WIP #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd13d6
Update imgui to 1.87-WIP
seanmiddleditch Feb 12, 2022
ea5164d
Silence a (hopefull) false warning in GCC for imgui sdl backend
seanmiddleditch Feb 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion depends.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ up_require(catch2
)
up_require(imgui
GIT_REPOSITORY git://github.com/ocornut/imgui.git
GIT_COMMIT bac748fa95ac003c7b354139980f8b4b7f6ac5da
GIT_COMMIT 0647ba3badb9db94cb2dbc971cfc034e1c72f48a
CMAKE_FILE imgui.cmake
)
up_require(glm
Expand Down
4 changes: 4 additions & 0 deletions external/imgui.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ target_sources(imgui_backend_sdl INTERFACE
"${imgui_SOURCE_DIR}/backends/imgui_impl_sdl.cpp"
"${imgui_SOURCE_DIR}/backends/imgui_impl_sdl.h"
)
# bug in 1.87 WIP - remove when it's fixed
target_compile_options(imgui_backend_sdl INTERFACE
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=array-bounds>
)