Skip to content

Commit

Permalink
Fix for bug #296
Browse files Browse the repository at this point in the history
Signed-off-by: dianlight <lucio.tarantino@gmail.com>
  • Loading branch information
dianlight committed Jun 16, 2022
1 parent d28856f commit 1c55b9e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# do not stop on 1st fail
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-11, windows-2019]
os: [ubuntu-20.04, macos-12, windows-2019]

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -94,6 +94,7 @@ jobs:
export Qt5_DIR=$(brew --prefix qt5);
export PATH=${Qt5_DIR}/bin:${PATH};
cd openhantek ; macdeployqt OpenHantek.app -always-overwrite -verbose=1;
cp /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib OpenHantek.app/Contents/Frameworks/;
python ../../utils/macdeployqtfix/macdeployqtfix.py
--quiet OpenHantek.app/Contents/MacOS/OpenHantek ${Qt5_DIR};
create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ firmware/hex
*.autosave
ui_*.h
*.sh
.DS_Store
2 changes: 1 addition & 1 deletion openhantek/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if(WIN32 AND MINGW)
endif()

# Enable MacOSX bundle magic in the next line
option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" OFF)
option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
#
if( APPLE AND BUILD_MACOSX_BUNDLE )
set( EXECTYPE MACOSX_BUNDLE )
Expand Down

0 comments on commit 1c55b9e

Please sign in to comment.