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-docs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 210391e89b5a
Choose a base ref
...
head repository: ngscopeclient/scopehal-docs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f03d5d61f4f5
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 14, 2020

  1. Wrap a long line

    attie-argentum committed Nov 14, 2020
    Copy the full SHA
    13a05b0 View commit details
  2. Copy the full SHA
    8f86e50 View commit details
  3. Copy the full SHA
    570e41e View commit details
  4. Copy the full SHA
    9515ab7 View commit details
  5. Merge pull request #20 from attie/windows-install

    Update Windows install notes
    azonenberg authored Nov 14, 2020
    Copy the full SHA
    f03d5d6 View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 section-gettingstarted.tex
11 changes: 8 additions & 3 deletions section-gettingstarted.tex
Original file line number Diff line number Diff line change
@@ -124,29 +124,34 @@ \subsection{Windows}
cd ffts
mkdir build
cd build
cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX -DENABLE_SHARED=ON ..
cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX \
-DENABLE_SHARED=ON ..
mingw32-make -j4
mingw32-make install
\end{lstlisting}

The unit tests will not be run as part of this build - if you would like to run them, you will need to provide catch2 (https://github.com/catchorg/Catch2), and remove the -DBUILD\_TESTING=OFF flag from below.

\item Build scopehal and scopehal-apps
\begin{lstlisting}[language=sh]
git clone https://github.com/azonenberg/scopehal-apps.git --recurse-submodules
cd scopehal-apps
mkdir build
cd build
cmake -G"MinGW Makefiles" -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ \
-DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a ./..
-DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a \
-DBUILD_TESTING=OFF ..
mingw32-make -j4
\end{lstlisting}

\item Copying binaries and running glscopeclient \\
Since glscopeclient is built using the MinGW toolchain, it depends on a rather large number of dynamic libraries. Since the application cannot find these libraries when being run from the build directory, there are two ways to make glscopeclient runnable: ``packaging'' the application by collecting all the depedencies, and installing it into the MinGW64 virtual file system.
Since glscopeclient is built using the MinGW toolchain, it depends on a rather large number of dynamic libraries. Since the application cannot find these libraries when being run from the build directory, there are two ways to make glscopeclient runnable: copying it into place in the MinGW64 virtual file system, and ``packaging'' the application by collecting all the depedencies.

\begin{enumerate}
\item Installing glscopeclient into the virtual filesystem
\begin{lstlisting}[language=sh]
cp ./src/glscopeclient/glscopeclient.exe /mingw64/bin/
cp -r ./src/glscopeclient/icons /mingw64/bin/
cp -r ./src/glscopeclient/shaders /mingw64/bin/
cp -r ./src/glscopeclient/styles /mingw64/bin/
cp -r ./src/glscopeclient/gradients /mingw64/bin/