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.

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

[upstream utils] Upstream imgui and friends #6822

Merged
merged 17 commits into from
Jul 21, 2024

Conversation

pjreiniger
Copy link
Contributor

@pjreiniger pjreiniger commented Jul 10, 2024

Fixes #6809

  • Gradle build
  • Cmake Build
  • Publishing

I made some executive decisions for this first pass.

  • Libraries are split into include / src, like is standard here, but was not in the thirdparty repo
  • I'm building the imgui / glfw / gl3w / stb / fonts as a single library, like the thirdparty repo. Because of this, the upstream file bundles them all into a "imgui suite"
  • The glfw sources are left as .c, instead of getting automatically converted to .cpp like the upstream library wants to do by default. These are in fact C files, and are compiled as such, so I think their extension should match.
  • I'm treating fonts and gl3w as generated files as opposed to part of the upstream process. This more accurately reflects how things are built in reality, and what happened in the thirdparty repo. I copied the generate_fonts.sh script as, so it is a bash script that will only run on Linux

wpilibjExamples/networktables.json.bck Outdated Show resolved Hide resolved
upstream_utils/update_libssh.py Outdated Show resolved Hide resolved
thirdparty/imgui_suite/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@calcmogul calcmogul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be rebased to use the new upstream_utils API.

thirdparty/imgui_suite/CMakeLists.txt Outdated Show resolved Hide resolved
calcmogul
calcmogul previously approved these changes Jul 19, 2024
@pjreiniger pjreiniger marked this pull request as ready for review July 19, 2024 22:53
@pjreiniger pjreiniger requested review from a team as code owners July 19, 2024 22:53
@PeterJohnson PeterJohnson merged commit 6922b9d into wpilibsuite:main Jul 21, 2024
33 checks passed
@pjreiniger pjreiniger deleted the upstream_imgui branch October 13, 2024 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move imgui into the monorepo via upstream_utils
4 participants