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: 831c980883ba
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: b6da2a948f6f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 17, 2021

  1. update MSYS2 build/install guidelines

    @umarcor
    umarcor committed May 17, 2021
    Copy the full SHA
    3aca228 View commit details

  2. Merge pull request #28 from umarcor/update-msys2 

    update MSYS2 build/install guidelines
    @azonenberg
    azonenberg authored May 17, 2021
    Copy the full SHA
    b6da2a9 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 section-gettingstarted.tex
8 changes: 5 additions & 3 deletions section-gettingstarted.tex
View file
Original file line number Diff line number Diff line change
@@ -149,7 +149,9 @@ \subsection{Windows}
cd ffts
mkdir build
cd build
cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX \
cmake \
-G"MinGW Makefiles" \
-DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX \
-DENABLE_SHARED=ON ..
mingw32-make -j4
mingw32-make install
@@ -163,8 +165,8 @@ \subsection{Windows}
cd scopehal-apps
mkdir build
cd build
cmake -G"MinGW Makefiles" -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ffts \
-DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a \
cmake \
-G"MinGW Makefiles" \
-DBUILD_TESTING=OFF ..
mingw32-make -j4
\end{lstlisting}