Skip to content

Commit b3afdec

Browse files
committed
documentation update - upversion to 3.3.1
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent f0523cf commit b3afdec

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Every commit triggers a workflow on
9898
that builds and packages OpenHantek6022 for:
9999
* Linux (`*.deb`, `*.rpm`, `*.tar.gz`)
100100
* Windows (`*.zip`)
101-
* macOS - currently only build but no package upload due to a regression caused by incompatible changes on macos side.
101+
* macOS - (`*.dmg`, `*.tar.gz`)
102102

103103
[![GitHub CI](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml/badge.svg)](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml)
104104
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:
125125
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.
126126

127127
## Install Prebuilt Binary Packages
128-
* 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.
128+
* 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.
129129
* 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).
130130
* For RPi4 see also [issue #28](https://github.com/OpenHantek/OpenHantek6022/issues/28).
131131
* These binary packages are built on stable operating system versions and require an up-to-date system.
48 Bytes
Binary file not shown.
40 Bytes
Binary file not shown.

docs/build.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,19 @@ We recommend homebrew to install the required libraries.
125125
git submodule update --init --recursive
126126
brew update
127127
brew install libusb fftw qt5 cmake binutils create-dmg
128+
# the next two commands (hack from @warpme) fix #314
129+
mkdir -p /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework
130+
ln -sf /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib \
131+
/usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework/libgcc_s.1.1.dylib
128132

129133
If you want to build an OSX bundle make sure the option in `openhantek/CMakeLists.txt` is set accordingly:
130134

131135
option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
132136

133137
After you've installed the requirements run the following commands inside the top directory of this package:
134138

135-
mkdir build
139+
mkdir -p build
140+
rm -rf build/*
136141
cd build
137142
cmake ..
138143
#

openhantek/src/OH_BUILD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Do not edit, will be re-created at each commit!
2-
#define OH_BUILD "20220731 - commit 1039"
2+
#define OH_BUILD "20220731 - commit 1040"

openhantek/src/OH_VERSION.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// next line shall define either OH_VERSION or LAST_OH_VERSION
1111
//
12-
#define LAST_OH_VERSION "3.3.0.1"
12+
#define OH_VERSION "3.3.1"
1313

1414

1515
// do not edit below

0 commit comments

Comments
 (0)