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
base: 52b474bc2c67
Choose a base ref
...
head repository: ngscopeclient/scopehal
compare: 545e2f91ae00
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 18, 2021

  1. CMakeLists: Find shared yaml-cpp on mingw 

    This was updated for MacOS a while ago but that broke mingw/windows
    @MegabytePhreak
    MegabytePhreak committed Jun 18, 2021
    Copy the full SHA
    1494a73 View commit details
    Browse the repository at this point in the history

  2. Unit: Fix windows compile

    @MegabytePhreak
    MegabytePhreak committed Jun 18, 2021
    Copy the full SHA
    e0964ff View commit details
    Browse the repository at this point in the history

  3. scopehal: Improve resource search on windows 

    Improve windows (mingw64) builds to look for resources such as
shaders, icons, etc. in the share directory adjacent to the bin
directory where execuatable lives. This matches the pattern for a
mingw64 package install, and is the same as on Linux.

Without this, a freshly installed mingw package will fail to start
the glscopeclient GUI due to inability to find resources.
    @MegabytePhreak
    MegabytePhreak committed Jun 18, 2021
    Copy the full SHA
    6287a26 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #503 from MegabytePhreak/windows-fixes 

    Windows fixes
    @azonenberg
    azonenberg committed Jun 18, 2021
    Copy the full SHA
    545e2f9 View commit details
    Browse the repository at this point in the history