LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix macOS build

Browse source
This commit is contained in:
anatoly-os 2019-12-17 15:47:08 +02:00
parent f6fd678803
commit f67d375581
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main/CMakeLists.txt
View file

@ -55,12 +55,12 @@ if (MSCORE_OUTPUT_NAME)
)
endif (MSCORE_OUTPUT_NAME)
target_include_directories(${ExecutableName} PRIVATE
target_include_directories(mscore PRIVATE
${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/thirdparty
)
target_link_libraries(${ExecutableName} mscoreapp)
target_link_libraries(mscore mscoreapp)
if (APPLE)
@ -242,6 +242,7 @@ else (MINGW)
PROPERTIES
LINK_FLAGS "-stdlib=libc++"
)
xcode_pch(mscore all)
install (TARGETS mscore BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
install (FILES "${PROJECT_SOURCE_DIR}/mscore/data/mscore.icns" DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME})
install (FILES "${PROJECT_SOURCE_DIR}/mscore/data/musescoreDocument.icns" DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME})

6
mscore/musescore.cpp
View file

@ -7464,7 +7464,7 @@ int runApplication(int& argc, char** av)
QSettings::setDefaultFormat(QSettings::IniFormat);
#endif
const auto cmdLineParseResult = MuseScoreApplication::parseCommandLineArguments(app);
auto cmdLineParseResult = MuseScoreApplication::parseCommandLineArguments(app);
if (cmdLineParseResult.exit)
return 0;
@ -7483,7 +7483,7 @@ int runApplication(int& argc, char** av)
return qApp->exec();
}
void MuseScore::init(const QStringList& argv)
void MuseScore::init(QStringList& argv)
{
mscoreGlobalShare = getSharePath();
iconPath = externalIcons ? mscoreGlobalShare + QString("icons/") : QString(":/data/icons/");
@ -7723,7 +7723,7 @@ void MuseScore::init(const QStringList& argv)
#ifdef Q_OS_MAC
// app->paths contains files requested to be loaded by OS X
// append these to argv and update file count
foreach(const QString& name, app->paths) {
foreach(const QString& name, static_cast<MuseScoreApplication*>(qApp)->paths) {
if (!name.isEmpty()) {
argv << name;
++files;

2
mscore/musescore.h
View file

@ -892,7 +892,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
ScriptRecorder* getScriptRecorder();
bool runTestScripts(const QStringList& scripts);
static void init(const QStringList& argv);
static void init(QStringList& argv);
friend class TestWorkspaces;
};