Fix macOS crash on startup
This commit is contained in:
parent
588c760e8a
commit
52b6159bb8
2 changed files with 50 additions and 37 deletions
|
@ -459,7 +459,7 @@ if(BUILD_ENV_MSVC)
|
|||
${GL_LIB} ${GLUT_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS} ${EXTRA_LIBS} strmiids
|
||||
tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm
|
||||
)
|
||||
elseif(BUILD_ENV_APPLE)
|
||||
elseif(BUILD_ENV_APPLE AND WITH_CANON)
|
||||
find_library(COCOA_LIB Cocoa)
|
||||
|
||||
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;colorfx;tnzext;image;sound;toonzqt;tnztools")
|
||||
|
@ -467,9 +467,22 @@ elseif(BUILD_ENV_APPLE)
|
|||
# 変なところにライブラリ生成するカスども
|
||||
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
|
||||
|
||||
if(WITH_CANON)
|
||||
set(EXTRA_LIBS ${EXTRA_LIBS} ${CANON_LIB})
|
||||
endif()
|
||||
add_dependencies(Tahoma2D tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
|
||||
|
||||
target_link_libraries(Tahoma2D
|
||||
Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
|
||||
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia Qt5::MultimediaWidgets Qt5::SerialPort
|
||||
${GL_LIB} ${GLUT_LIB} ${CANON_LIB} ${TURBOJPEG_LIB} ${OpenCV_LIBS}
|
||||
${COCOA_LIB} ${EXTRA_LIBS} mousedragfilter
|
||||
)
|
||||
|
||||
elseif(BUILD_ENV_APPLE)
|
||||
find_library(COCOA_LIB Cocoa)
|
||||
|
||||
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;colorfx;tnzext;image;sound;toonzqt;tnztools")
|
||||
|
||||
# 変なところにライブラリ生成するカスども
|
||||
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
|
||||
|
||||
add_dependencies(Tahoma2D tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
|
||||
|
||||
|
|
|
@ -328,26 +328,6 @@ int main(int argc, char *argv[]) {
|
|||
argc = 1;
|
||||
}
|
||||
|
||||
// Toonz environment
|
||||
initToonzEnv(argumentPathValues);
|
||||
|
||||
#ifdef WITH_CRASHRPT
|
||||
CR_INSTALL_INFO pInfo;
|
||||
memset(&pInfo, 0, sizeof(CR_INSTALL_INFO));
|
||||
pInfo.cb = sizeof(CR_INSTALL_INFO);
|
||||
pInfo.pszAppName = convertToLPCWSTR(TEnv::getApplicationName());
|
||||
pInfo.pszAppVersion = convertToLPCWSTR(TEnv::getApplicationVersion());
|
||||
TFilePath crashrptCache =
|
||||
ToonzFolder::getCacheRootFolder() + TFilePath("crashrpt");
|
||||
pInfo.pszErrorReportSaveDir =
|
||||
convertToLPCWSTR(crashrptCache.getQString().toStdString());
|
||||
// Install all available exception handlers.
|
||||
// Don't send reports automaticall, store locally
|
||||
pInfo.dwFlags |= CR_INST_ALL_POSSIBLE_HANDLERS | CR_INST_DONT_SEND_REPORT;
|
||||
|
||||
crInstall(&pInfo);
|
||||
#endif
|
||||
|
||||
// Enables high-DPI scaling. This attribute must be set before QApplication is
|
||||
// constructed. Available from Qt 5.6.
|
||||
#if QT_VERSION >= 0x050600
|
||||
|
@ -511,6 +491,26 @@ int main(int argc, char *argv[]) {
|
|||
TBigMemoryManager::instance()->setRunOutOfContiguousMemoryHandler(
|
||||
&toonzRunOutOfContMemHandler);
|
||||
|
||||
// Toonz environment
|
||||
initToonzEnv(argumentPathValues);
|
||||
|
||||
#ifdef WITH_CRASHRPT
|
||||
CR_INSTALL_INFO pInfo;
|
||||
memset(&pInfo, 0, sizeof(CR_INSTALL_INFO));
|
||||
pInfo.cb = sizeof(CR_INSTALL_INFO);
|
||||
pInfo.pszAppName = convertToLPCWSTR(TEnv::getApplicationName());
|
||||
pInfo.pszAppVersion = convertToLPCWSTR(TEnv::getApplicationVersion());
|
||||
TFilePath crashrptCache =
|
||||
ToonzFolder::getCacheRootFolder() + TFilePath("crashrpt");
|
||||
pInfo.pszErrorReportSaveDir =
|
||||
convertToLPCWSTR(crashrptCache.getQString().toStdString());
|
||||
// Install all available exception handlers.
|
||||
// Don't send reports automaticall, store locally
|
||||
pInfo.dwFlags |= CR_INST_ALL_POSSIBLE_HANDLERS | CR_INST_DONT_SEND_REPORT;
|
||||
|
||||
crInstall(&pInfo);
|
||||
#endif
|
||||
|
||||
// Initialize thread components
|
||||
TThread::init();
|
||||
|
||||
|
|
Loading…
Reference in a new issue