Skip to content
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: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f8ad488e85c9
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c57f744808f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2020

  1. Copy the full SHA
    304e537 View commit details
  2. Merge pull request #265 from Cushychicken/readme_update

    Updated README.md
    azonenberg authored Oct 30, 2020
    Copy the full SHA
    4c57f74 View commit details
Showing with 18 additions and 7 deletions.
  1. +18 −7 README.md
25 changes: 18 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,23 +7,30 @@ Applications for libscopehal
## Installation

### Linux
Install dependencies on ubuntu with
#### Install dependencies.

On Debian/Ubuntu:

```
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 libglew-dev
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 libglew-dev catch2
```

Install FFTS library
If you are using an older stable release (such as Debian Buster), you may need to install catch2 from source (https://github.com/catchorg/Catch2). Alternatively, you may pass `-DBUILD_TESTING=OFF` to CMake to disable unit testing, which is not necessary if you are not contributing to the codebase.

#### Install FFTS library.

```
git clone https://github.com/anthonix/ffts.git
cd ffts
mkdir build
cd build
cmake ..
make
cmake .. -DENABLE_SHARED=ON
make -j4
sudo make install
```

Build scopehal and scopehal-apps
#### Build scopehal and scopehal-apps.

```
git clone https://github.com/azonenberg/scopehal-apps.git --recurse-submodules
cd scopehal-apps
@@ -33,7 +40,11 @@ cmake ..
make
```

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

#### Install scopehal and scopehal-apps.

There is currently no process for installing `scopehal` or `scopehal-apps`. At this moment, `glscopeclient` is intended to be run from the source directory (`src/glscopeclient`). We welcome your help in setting up a proper install process!

### Windows (experimental)