From 5408024f4e17afb4823b70f13e6582d89f2ecacd Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 30 Oct 2024 15:50:38 +0100 Subject: [PATCH] wip --- frontends/qt/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile index a98b1321f3..255046b93a 100644 --- a/frontends/qt/Makefile +++ b/frontends/qt/Makefile @@ -46,6 +46,10 @@ osx: $(MAKE) clean cd server && $(MAKE) macosx $(MAKE) base + echo ${PATH} + ls ~/Qt/6.2.4/macos/bin/qmake + ~/Qt/6.2.4/macos/bin/qmake -version + qmake -version qmake -set MACOS_MIN_VERSION $(MACOS_MIN_VERSION) # See https://stackoverflow.com/questions/77136519/qmake-failing-with-sdk-14-ventura-13-5-2 qmake -early QMAKE_DEFAULT_LIBDIRS=$(shell xcrun -show-sdk-path)/usr/lib -o build/Makefile @@ -54,9 +58,7 @@ osx: mv build/BitBox.app build/osx/ cp resources/MacOS/Info.plist build/osx/BitBox.app/Contents/ cp resources/MacOS/icon.icns build/osx/BitBox.app/Contents/Resources/ - # The `-executable` flag is needed to make the macOS build work when Qt is installed from homebrew. - # It works without it when Qt is installed using the official installer. - cd build/osx/ && macdeployqt BitBox.app -executable=BitBox.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess + cd build/osx/ && macdeployqt BitBox.app cp server/libserver.so build/osx/BitBox.app/Contents/Frameworks cp build/assets.rcc build/osx/BitBox.app/Contents/MacOS/ install_name_tool -change libserver.so @executable_path/../Frameworks/libserver.so build/osx/BitBox.app/Contents/MacOS/BitBox