diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45bf8ab70b802..6bb92a614ec00 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,64 +19,64 @@ # along with this program. If not, see . # Framework, should be first to work pch -add_subdirectory(framework) +# add_subdirectory(framework) # App (main) add_subdirectory(app) -# Modules -if (MUE_BUILD_APPSHELL_MODULE) - add_subdirectory(appshell) -endif() +# # Modules +# if (MUE_BUILD_APPSHELL_MODULE) +# add_subdirectory(appshell) +# endif() -if (MUE_BUILD_BRAILLE_MODULE) - add_subdirectory(braille) -endif() +# if (MUE_BUILD_BRAILLE_MODULE) +# add_subdirectory(braille) +# endif() -add_subdirectory(commonscene) -add_subdirectory(context) +# add_subdirectory(commonscene) +# add_subdirectory(context) -if (MUE_BUILD_CONVERTER_MODULE) - add_subdirectory(converter) -endif() +# if (MUE_BUILD_CONVERTER_MODULE) +# add_subdirectory(converter) +# endif() -add_subdirectory(engraving) +# add_subdirectory(engraving) -add_subdirectory(importexport) +# add_subdirectory(importexport) -if (MUE_BUILD_INSPECTOR_MODULE) - add_subdirectory(inspector) -endif() +# if (MUE_BUILD_INSPECTOR_MODULE) +# add_subdirectory(inspector) +# endif() -if (MUE_BUILD_INSTRUMENTSSCENE_MODULE) - add_subdirectory(instrumentsscene) -endif() +# if (MUE_BUILD_INSTRUMENTSSCENE_MODULE) +# add_subdirectory(instrumentsscene) +# endif() -if (MUE_BUILD_NOTATION_MODULE) - add_subdirectory(notation) -endif() +# if (MUE_BUILD_NOTATION_MODULE) +# add_subdirectory(notation) +# endif() -if (MUE_BUILD_PALETTE_MODULE) - add_subdirectory(palette) -endif() +# if (MUE_BUILD_PALETTE_MODULE) +# add_subdirectory(palette) +# endif() -if (MUE_BUILD_PLAYBACK_MODULE) - add_subdirectory(playback) -endif() +# if (MUE_BUILD_PLAYBACK_MODULE) +# add_subdirectory(playback) +# endif() -add_subdirectory(print) +# add_subdirectory(print) -if (MUE_BUILD_PROJECT_MODULE) - add_subdirectory(project) -endif() +# if (MUE_BUILD_PROJECT_MODULE) +# add_subdirectory(project) +# endif() -if (MUSE_MODULE_WORKSPACE) - add_subdirectory(workspacescene) -endif() +# if (MUSE_MODULE_WORKSPACE) +# add_subdirectory(workspacescene) +# endif() -# Stubs -add_subdirectory(stubs) +# # Stubs +# add_subdirectory(stubs) -if (OS_IS_WASM) - add_subdirectory(wasmtest) -endif() +# if (OS_IS_WASM) +# add_subdirectory(wasmtest) +# endif() diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index a0dc17fac2d7e..f20f4264b062b 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -126,96 +126,96 @@ endif() ########################################### set(LINK_LIB ${QT_LIBRARIES} - muse::global - muse::draw - muse::network - - braille - muse::diagnostics - engraving - muse::actions - muse::accessibility - context - muse::shortcuts - muse::workspace - workspacescene - muse::audio - muse::mpe - muse::midi - muse::learn - notation - project - print - commonscene - palette - inspector - playback - instrumentsscene - muse::vst - muse::update + # muse::global + # muse::draw + # muse::network + + # braille + # muse::diagnostics + # engraving + # muse::actions + # muse::accessibility + # context + # muse::shortcuts + # muse::workspace + # workspacescene + # muse::audio + # muse::mpe + # muse::midi + # muse::learn + # notation + # project + # print + # commonscene + # palette + # inspector + # playback + # instrumentsscene + # muse::vst + # muse::update ) -if (MUSE_MODULE_UI) - list(APPEND LINK_LIB muse::ui) - list(APPEND LINK_LIB muse::uicomponents) - list(APPEND LINK_LIB muse::dockwindow) -endif() - -if (MUSE_MODULE_AUDIOPLUGINS) - list(APPEND LINK_LIB muse::audioplugins) -endif() - -if (MUE_BUILD_CONVERTER_MODULE) - list(APPEND LINK_LIB converter) -endif() - -if (MUE_BUILD_APPSHELL_MODULE) - list(APPEND LINK_LIB appshell) -endif() - -if (NOT CC_IS_EMSCRIPTEN) - list(APPEND LINK_LIB muse::cloud) - list(APPEND LINK_LIB muse::languages) - list(APPEND LINK_LIB muse::multiinstances) - - if (MUSE_MODULE_EXTENSIONS) - list(APPEND LINK_LIB muse::extensions) - endif() - - if (MUE_BUILD_IMPORTEXPORT_MODULE) - set(LINK_LIB ${LINK_LIB} - iex_musicxml - iex_bb - iex_bww - iex_capella - iex_guitarpro - iex_midi - iex_musedata - iex_ove - iex_audioexport - iex_imagesexport - iex_mei - ) - - if (MUE_BUILD_VIDEOEXPORT_MODULE) - list(APPEND LINK_LIB iex_videoexport) - endif() - else() - if (MUE_BUILD_IMAGESEXPORT_MODULE) - list(APPEND LINK_LIB iex_imagesexport) - endif() - endif() - -endif() - - -if (MUSE_MODULE_AUTOBOT) - list(APPEND LINK_LIB muse::autobot) -endif() - -if (MUSE_MODULE_MUSESAMPLER) - list(APPEND LINK_LIB muse::musesampler) -endif() +# if (MUSE_MODULE_UI) +# list(APPEND LINK_LIB muse::ui) +# list(APPEND LINK_LIB muse::uicomponents) +# list(APPEND LINK_LIB muse::dockwindow) +# endif() + +# if (MUSE_MODULE_AUDIOPLUGINS) +# list(APPEND LINK_LIB muse::audioplugins) +# endif() + +# if (MUE_BUILD_CONVERTER_MODULE) +# list(APPEND LINK_LIB converter) +# endif() + +# if (MUE_BUILD_APPSHELL_MODULE) +# list(APPEND LINK_LIB appshell) +# endif() + +# if (NOT CC_IS_EMSCRIPTEN) +# list(APPEND LINK_LIB muse::cloud) +# list(APPEND LINK_LIB muse::languages) +# list(APPEND LINK_LIB muse::multiinstances) + +# if (MUSE_MODULE_EXTENSIONS) +# list(APPEND LINK_LIB muse::extensions) +# endif() + +# if (MUE_BUILD_IMPORTEXPORT_MODULE) +# set(LINK_LIB ${LINK_LIB} +# iex_musicxml +# iex_bb +# iex_bww +# iex_capella +# iex_guitarpro +# iex_midi +# iex_musedata +# iex_ove +# iex_audioexport +# iex_imagesexport +# iex_mei +# ) + +# if (MUE_BUILD_VIDEOEXPORT_MODULE) +# list(APPEND LINK_LIB iex_videoexport) +# endif() +# else() +# if (MUE_BUILD_IMAGESEXPORT_MODULE) +# list(APPEND LINK_LIB iex_imagesexport) +# endif() +# endif() + +# endif() + + +# if (MUSE_MODULE_AUTOBOT) +# list(APPEND LINK_LIB muse::autobot) +# endif() + +# if (MUSE_MODULE_MUSESAMPLER) +# list(APPEND LINK_LIB muse::musesampler) +# endif() set (MSCORE_APPEND_SRC) @@ -250,16 +250,16 @@ add_executable(${EXECUTABLE_NAME} ${APP_RCC_SOURCES} ${MSCORE_APPEND_SRC} main.cpp - cmdoptions.h - appfactory.cpp - appfactory.h - - internal/commandlineparser.cpp - internal/commandlineparser.h - internal/consoleapp.cpp - internal/consoleapp.h - internal/guiapp.cpp - internal/guiapp.h + # cmdoptions.h + # appfactory.cpp + # appfactory.h + + # internal/commandlineparser.cpp + # internal/commandlineparser.h + # internal/consoleapp.cpp + # internal/consoleapp.h + # internal/guiapp.cpp + # internal/guiapp.h ) diff --git a/src/app/main.cpp b/src/app/main.cpp index 1ce100cde486d..100d169409e89 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -27,13 +27,13 @@ #include #include -#include "appfactory.h" -#include "internal/commandlineparser.h" -#include "global/iapplication.h" +// #include "appfactory.h" +// #include "internal/commandlineparser.h" +// #include "global/iapplication.h" -#include "muse_framework_config.h" +// #include "muse_framework_config.h" -#include "log.h" +// #include "log.h" #if (defined (_MSCVER) || defined (_MSC_VER)) #include @@ -42,26 +42,26 @@ #include #endif -#ifndef MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT -static void crashCallback(int signum) -{ - const char* signame = "UNKNOWN SIGNAME"; - const char* sigdescript = ""; - switch (signum) { - case SIGILL: - signame = "SIGILL"; - sigdescript = "Illegal Instruction"; - break; - case SIGSEGV: - signame = "SIGSEGV"; - sigdescript = "Invalid memory reference"; - break; - } - LOGE() << "Oops! Application crashed with signal: [" << signum << "] " << signame << "-" << sigdescript; - exit(EXIT_FAILURE); -} - -#endif +// #ifndef MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT +// static void crashCallback(int signum) +// { +// const char* signame = "UNKNOWN SIGNAME"; +// const char* sigdescript = ""; +// switch (signum) { +// case SIGILL: +// signame = "SIGILL"; +// sigdescript = "Illegal Instruction"; +// break; +// case SIGSEGV: +// signame = "SIGSEGV"; +// sigdescript = "Invalid memory reference"; +// break; +// } +// LOGE() << "Oops! Application crashed with signal: [" << signum << "] " << signame << "-" << sigdescript; +// exit(EXIT_FAILURE); +// } + +// #endif static void app_init_qrc() { @@ -74,11 +74,11 @@ static void app_init_qrc() int main(int argc, char** argv) { -#ifndef MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT - signal(SIGSEGV, crashCallback); - signal(SIGILL, crashCallback); - signal(SIGFPE, crashCallback); -#endif +// #ifndef MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT +// signal(SIGSEGV, crashCallback); +// signal(SIGILL, crashCallback); +// signal(SIGFPE, crashCallback); +// #endif // ==================================================== // Setup global Qt application variables @@ -127,7 +127,7 @@ int main(int argc, char** argv) #endif QCoreApplication::setOrganizationName("MuseScore"); QCoreApplication::setOrganizationDomain("musescore.org"); - QCoreApplication::setApplicationVersion(MUSE_APP_VERSION); + // QCoreApplication::setApplicationVersion(MUSE_APP_VERSION); #if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_WASM) // Any OS that uses Freedesktop.org Desktop Entry Specification (e.g. Linux, BSD) @@ -174,45 +174,45 @@ int main(int argc, char** argv) #endif - using namespace muse; - using namespace mu::app; + // using namespace muse; + // using namespace mu::app; // ==================================================== // Parse command line options // ==================================================== - CommandLineParser commandLineParser; - commandLineParser.init(); - commandLineParser.parse(argcFinal, argvFinal); + // CommandLineParser commandLineParser; + // commandLineParser.init(); + // commandLineParser.parse(argcFinal, argvFinal); - IApplication::RunMode runMode = commandLineParser.runMode(); - QCoreApplication* qapp = nullptr; + // IApplication::RunMode runMode = commandLineParser.runMode(); + // QCoreApplication* qapp = nullptr; - if (runMode == IApplication::RunMode::AudioPluginRegistration) { - qapp = new QCoreApplication(argcFinal, argvFinal); - } else { - qapp = new QApplication(argcFinal, argvFinal); - } + // if (runMode == IApplication::RunMode::AudioPluginRegistration) { + // qapp = new QCoreApplication(argcFinal, argvFinal); + // } else { + // qapp = new QApplication(argcFinal, argvFinal); + // } - commandLineParser.processBuiltinArgs(*qapp); + // commandLineParser.processBuiltinArgs(*qapp); - AppFactory f; - std::shared_ptr app = f.newApp(commandLineParser.options()); + // AppFactory f; + // std::shared_ptr app = f.newApp(commandLineParser.options()); - app->perform(); + // app->perform(); - // ==================================================== - // Run main loop - // ==================================================== - int code = qapp->exec(); + // // ==================================================== + // // Run main loop + // // ==================================================== + // int code = qapp->exec(); - // ==================================================== - // Quit - // ==================================================== + // // ==================================================== + // // Quit + // // ==================================================== - app->finish(); + // app->finish(); - delete qapp; + // delete qapp; - LOGI() << "Goodbye!! code: " << code; - return code; + // LOGI() << "Goodbye!! code: " << code; + return 0; }