Vendored nlohmann/json#282
Closed
Madreag wants to merge 2 commits into
Closed
Conversation
Contributor
|
Bit odd to have a PR specifically for adding an unused library. I think it makes more sense to have it functionally have a use before we merge this in. |
Contributor
Author
|
nothing uses it til the cccp-ctl determinism harness PR, so i'll just fold it into that one and close this out. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Vendors the single-header nlohmann/json under
external/sources/. Nothing uses it yet — it's the report format for the determinism test tooling later in this series.nlohmann/json 3.12.0 (MIT, license included) is just the one
json.hppheader, include-path only, nothing compiled. Wired into both build systems: a meson subproject and the include path inRTEA.vcxproj/.filters.The second commit catches the changelog up — entries for #279, #280 and this vendor.
Built clean and boots with the full mod stack on Windows (MSBuild), Linux (meson) and macOS.
This is the first of the determinism series, split into small PRs to keep review easy. Next are the cross-platform stability fixes and the LuaJIT determinism build flags; it all builds up to a same-seed deterministic sim and the test harness that proves it — the groundwork for controller-synced multiplayer.