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: 4251ebf8d3dd
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: 0452f4853b9e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 22, 2020

  1. Copy the full SHA
    0452f48 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 section-gettingstarted.tex
6 changes: 3 additions & 3 deletions section-gettingstarted.tex
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ \subsubsection{Linux}

\subsubsection{Windows}

On Windows, me make use of the MSYS2 development environment, which gives us access to the MingGW-w64 toolchain. Since this toolchain allows glscopeclient to be compiled as a native Windows application, MSYS2 is only needed to actually compile the project, not to run it.
On Windows, we make use of the MSYS2 development environment, which gives us access to the MingGW-w64 toolchain. Since this toolchain allows glscopeclient to be compiled as a native Windows application, MSYS2 is only needed to actually compile the project, not to run it.

\begin{enumerate}

@@ -95,7 +95,7 @@ \subsubsection{Windows}
\item Install build tools
\begin{lstlisting}[language=sh]
pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake \
mingw-w64-x86_64-make
mingw-w64-x86_64-make
\end{lstlisting}

\item Install dependencies
@@ -129,7 +129,7 @@ \subsubsection{Windows}
\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: ``packaging'' the application by collecting all the depedencies, and installing it into the MinGW64 virtual file system.

\begin{enumerate}
\item Installing glscopeclient into the virtual filesystem