Skip to content

kontakt7_crash_fix_430 #22327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RomanPudashkin merged 1 commit into from
Apr 12, 2024
Merged

kontakt7_crash_fix_430 #22327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions SetupConfigure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ endif()
# Setup paths
###########################################
if (OS_IS_MAC)
SET(Mscore_INSTALL_NAME "Contents/Resources/")
SET(Mscore_SHARE_NAME "mscore.app/")
SET(Mscore_INSTALL_NAME "Contents/Resources/")
SET(Mscore_FRAMEWORKS_NAME "Frameworks/")
SET(Mscore_SHARE_NAME "mscore.app/")
elseif (OS_IS_WIN)
SET(Mscore_INSTALL_NAME "")
SET(Mscore_SHARE_NAME "./")
Expand Down
4 changes: 4 additions & 0 deletions build/macos/qt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Paths]
Plugins = PlugIns
Copy link
Contributor

@igorkorsukov igorkorsukov Apr 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PlugIns - is this it should be?

Copy link
Contributor Author

@RomanPudashkin RomanPudashkin Apr 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's the standard name, see documentation

Imports = Resources/Frameworks/qml
Qml2Imports = Resources/Frameworks/qml
19 changes: 11 additions & 8 deletions build/package_mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,24 @@ rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtLocation.*
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtPurchasing.*
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtQuickParticles.*

rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/Enginio
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtBluetooth
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtNfc
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtLocation
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtPositioning
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtPurchasing
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/QtQuick/Particles*
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/qml/Qt/WebSockets
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/Enginio
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtBluetooth
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtNfc
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtLocation
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtPositioning
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtPurchasing
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/QtQuick/Particles*
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Resources/Frameworks/qml/Qt/WebSockets

find ${VOLUME}/${APPNAME}.app/Contents -type d -name "*.dSYM" -exec rm -r {} +

#homebrew libs may not be writable force it?
chmod -R +w /usr/local/Cellar/
macdeployqt ${VOLUME}/${APPNAME}.app

# replace qt.conf generated by macdeployqt
cp -f build/macos/qt.conf ${VOLUME}/${APPNAME}.app/Contents/Resources

# fix the libs, qt5.6 has @rpath...
BIN_FILE=${VOLUME}/${APPNAME}.app/Contents/MacOS/mscore
change_rpath $BIN_FILE
Expand Down
5 changes: 0 additions & 5 deletions build/qt.conf
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions build/windows/qt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Paths]
Prefix=./

[Platforms]
WindowsArguments = fontengine=freetype
4 changes: 2 additions & 2 deletions src/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ if (OS_IS_WIN)
list(REMOVE_DUPLICATES QtInstallLibraries)

install(FILES
${PROJECT_SOURCE_DIR}/build/qt.conf
${PROJECT_SOURCE_DIR}/build/windows/qt.conf
${QtInstallLibraries}
${QT_INSTALL_BINS}/libEGL.dll
${QT_INSTALL_BINS}/libGLESv2.dll
Expand Down Expand Up @@ -453,7 +453,7 @@ elseif(OS_IS_MAC)
if(MUE_COMPILE_INSTALL_QTQML_FILES)
install(DIRECTORY
${QT_INSTALL_QML}
DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}
DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}${Mscore_FRAMEWORKS_NAME}
REGEX ".*QtWebkit.*" EXCLUDE
REGEX ".*QtTest.*" EXCLUDE
REGEX ".*QtSensors.*" EXCLUDE
Expand Down