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: c6341a996afa
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: 3fea6cdc33e9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 29, 2021

  1. Updated readme to just point to manual for build instructions

    @azonenberg
    azonenberg committed May 29, 2021
    Copy the full SHA
    3fea6cd View commit details
Showing with 1 addition and 43 deletions.
  1. +1 −43 README.md
44 changes: 1 addition & 43 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -6,46 +6,4 @@ Applications for libscopehal

## Installation

### Linux
#### 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 catch2
```

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 .. -DENABLE_SHARED=ON
make -j4
sudo make install
```

#### Build scopehal and scopehal-apps.

```
git clone https://github.com/azonenberg/scopehal-apps.git --recurse-submodules
cd scopehal-apps
mkdir build
cd build
cmake ..
make
```

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)

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