diff --git a/README.md b/README.md index b4566f80..d004faf4 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ Every commit triggers a workflow on that builds and packages OpenHantek6022 for: * Linux (`*.deb`, `*.rpm`, `*.tar.gz`) * Windows (`*.zip`) -* macOS - currently only build but no package upload due to a regression caused by incompatible changes on macos side. +* macOS - (`*.dmg`, `*.tar.gz`) [![GitHub CI](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml/badge.svg)](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml) This status badge here (and on top) show the build status. @@ -125,7 +125,7 @@ To make building for Linux even easier, I provide two shell scripts: If you make small changes to the local source code, it is sufficient to call `make -j4` or `fakeroot make -j4 package` in the `build` directory. ## Install Prebuilt Binary Packages -* Download Linux (built on Ubuntu 1804 LTS), Raspberry Pi (Debian stable), FreeBSD (12.1), macOS (Catalina 10.15) and Windows (Visual Studio 2019) packages for your convenience from the [Releases](https://github.com/OpenHantek/OpenHantek6022/releases) page. +* Download Linux (Ubuntu 2004 LTS), Raspberry Pi (Debian stable), FreeBSD (12.1), macOS (Big Sur 11.6) and Windows (Visual Studio 2019) packages for your convenience from the [Releases](https://github.com/OpenHantek/OpenHantek6022/releases) page. * If you want to follow ongoing development, packages built from a fairly recent commit are available in the [unstable release](https://github.com/OpenHantek/OpenHantek6022/releases/tag/unstable). * For RPi4 see also [issue #28](https://github.com/OpenHantek/OpenHantek6022/issues/28). * These binary packages are built on stable operating system versions and require an up-to-date system. diff --git a/docs/OpenHantek6022_User_Manual.odt b/docs/OpenHantek6022_User_Manual.odt index b3148f2f..d16c7936 100644 Binary files a/docs/OpenHantek6022_User_Manual.odt and b/docs/OpenHantek6022_User_Manual.odt differ diff --git a/docs/OpenHantek6022_User_Manual.pdf b/docs/OpenHantek6022_User_Manual.pdf index 834ef234..53e8b58e 100644 Binary files a/docs/OpenHantek6022_User_Manual.pdf and b/docs/OpenHantek6022_User_Manual.pdf differ diff --git a/docs/build.md b/docs/build.md index 95cea009..013b332f 100644 --- a/docs/build.md +++ b/docs/build.md @@ -125,6 +125,10 @@ We recommend homebrew to install the required libraries. git submodule update --init --recursive brew update brew install libusb fftw qt5 cmake binutils create-dmg + # the next two commands (hack from @warpme) fix #314 + mkdir -p /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework + ln -sf /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib \ + /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework/libgcc_s.1.1.dylib If you want to build an OSX bundle make sure the option in `openhantek/CMakeLists.txt` is set accordingly: @@ -132,7 +136,8 @@ If you want to build an OSX bundle make sure the option in `openhantek/CMakeList After you've installed the requirements run the following commands inside the top directory of this package: - mkdir build + mkdir -p build + rm -rf build/* cd build cmake .. # diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h index 18aa433e..278067a2 100644 --- a/openhantek/src/OH_BUILD.h +++ b/openhantek/src/OH_BUILD.h @@ -1,2 +1,2 @@ // Do not edit, will be re-created at each commit! -#define OH_BUILD "20220731 - commit 1039" +#define OH_BUILD "20220731 - commit 1040" diff --git a/openhantek/src/OH_VERSION.h b/openhantek/src/OH_VERSION.h index da509e22..de0a2a0b 100644 --- a/openhantek/src/OH_VERSION.h +++ b/openhantek/src/OH_VERSION.h @@ -9,7 +9,7 @@ // next line shall define either OH_VERSION or LAST_OH_VERSION // -#define LAST_OH_VERSION "3.3.0.1" +#define OH_VERSION "3.3.1" // do not edit below