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: cf7d9a7ce475
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: 05da14cd8b45
Choose a head ref
  • 9 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 21, 2020

  1. Add build target for Windows

    kench authored Oct 21, 2020
    Copy the full SHA
    873378a View commit details
  2. Copy the full SHA
    1023d0f View commit details

Commits on Oct 22, 2020

  1. Set an upper concurrency limit when building

    Not everyone has 100GB of RAM when building...
    kench authored Oct 22, 2020
    Copy the full SHA
    6d14d81 View commit details
  2. Use -j4 for make commands

    Update the make argument so that it's in line with the updated build instructions.
    kench authored Oct 22, 2020
    Copy the full SHA
    814b0e5 View commit details
  3. Build FFTS as a shared library

    Follow updated build instructions.
    kench authored Oct 22, 2020
    Copy the full SHA
    6dfbf15 View commit details

Commits on Oct 23, 2020

  1. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    dc817b5 View commit details
  2. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    bc281d5 View commit details
  3. Update build.yml

    kench authored Oct 23, 2020
    Copy the full SHA
    b2ec9a2 View commit details
  4. Merge pull request #244 from kench/github-actions-windows

    Enable Windows build in GitHub Actions
    azonenberg authored Oct 23, 2020
    Copy the full SHA
    05da14c View commit details
Showing with 32 additions and 2 deletions.
  1. +32 −2 .github/workflows/build.yml
34 changes: 32 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -19,9 +19,39 @@ jobs:

- name: Build FFTS Library
shell: bash
run: pushd /tmp/ffts && mkdir build && cd build && cmake ../ && make && sudo make install && popd
run: pushd /tmp/ffts && mkdir build && cd build && cmake .. -DENABLE_SHARED=ON && make -j4 && sudo make install && popd

- name: Build
shell: bash
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake ../ && make
run: mkdir build && cd build && cmake ../ && make -j4

windows:
runs-on: windows-latest

defaults:
run:
shell: msys2 {0}

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: msys2/setup-msys2@v2
with:
update: true
install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-glm mingw-w64-x86_64-libsigc++ mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-yaml-cpp mingw-w64-x86_64-glew

- name: Clone FFTS Repository
shell: bash
working-directory: ${{runner.workspace}}
run: git clone https://github.com/anthonix/ffts.git

- name: Build FFTS Library
working-directory: ${{runner.workspace}}/ffts
run: mkdir build && cd build && cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX -DENABLE_SHARED=ON .. && mingw32-make -j4 && mingw32-make install

- name: Build
working-directory: ${{runner.workspace}}/scopehal-apps
run: mkdir build && cd build && cmake -G"MinGW Makefiles" -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ffts/ -DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a ./.. && mingw32-make -j4