Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7ed2bee47eae
Choose a base ref
...
head repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e30974b94e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Copy the full SHA
    30a9d9d View commit details
  2. Merge pull request #16 from nshcat/patch-1

    Update README.md to include Windows build instructions
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    7e30974 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 README.md
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ CMake build wrapper for scopehal and scopehal-apps
[C++ coding policy](https://github.com/azonenberg/coding-policy/blob/master/cpp-coding-policy.md)

## Installation

### Linux
Install dependencies on ubuntu with
```
sudo apt-get install build-essential cmake pkg-config libglm-dev libgtkmm-3.0-dev libsigc++-2.0-dev libyaml-cpp-dev liblxi-dev texlive texlive-fonts-extra
@@ -31,3 +33,7 @@ make
```

The executable is found unter `build/src/glscopeclient/glscopeclient` and the manual under `build/doc/glscopeclient-manual.pdf`

### Windows (experimental)

Refer to [the manual](https://www.antikernel.net/temp/glscopeclient-manual.pdf) for instructions regarding compilation on Windows systems.