Migrate the gui-dev branch over to the new submodule format #181
Conversation
This file contains 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
Include basic procedure to build and run glscopeclient on GNU/ Linux (Debian/Ubuntu)
Created basic README.md and Updated CMakeLists add glm check and add FFTS check with
Also use out-of-tree builds for scopehal.
Search for libffts in ~/.local as well
README: reformat to use block code tags
…dge (TODO non-x86 support) as a reasonable compromise between binary portability and performance
…or the selected instrument and viewing properties for them. No support for changing trigger settings yet.
…w them to be configured
… later, but for now it can be changed by the trigger properties dialog. Fixes ngscopeclient#12.
…copeclient#174). Doesn't do anything yet. Added foreground color customization support.
This was needed as master couldn't be merged into gui-dev cleanly due to the submodule refactoring.
|
Abandoning this PR due to merge issues, will resubmit with a different branch name so that it can be merged properly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This changeset migrates the gui-dev branch to the new submodule format and brings it up-to-date with HEAD. Note that this replaces gui-dev wholesale -- trying to merge master into gui-dev broke the submodules, hence the complexity here.