diff --git a/docs b/docs index e1e8fac77..790927104 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit e1e8fac775846ea3cf0a17947a777cbfffa1aba4 +Subproject commit 790927104cf84e664a546abc9f58b843777161c0 diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 8a1f53b53..a7873b4cb 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -34,6 +34,10 @@ add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}") if(${LINUX_DEPLOY}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + add_definitions(-DLINUX_DEPLOY) +endif() +if(${WIN_DEPLOY}) + add_definitions(-DWIN_DEPLOY) endif() option(USE_ROBOTO "Use Roboto font" OFF) @@ -427,10 +431,17 @@ set( resources.qrc icons.qrc hicolor.qrc - ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/docs.qrc ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/easing.qrc ) +if(${LINUX_DEPLOY}) + list(APPEND RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/docs_lin.qrc) +elseif(${WIN_DEPLOY}) + list(APPEND RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/docs_win.qrc) +else() + list(APPEND RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/docs.qrc) +endif() + if(${USE_ROBOTO}) list(APPEND RESOURCES fonts.qrc) endif() diff --git a/src/app/GUI/aboutwidget.cpp b/src/app/GUI/aboutwidget.cpp index e3086c184..ecd86cb0d 100644 --- a/src/app/GUI/aboutwidget.cpp +++ b/src/app/GUI/aboutwidget.cpp @@ -103,23 +103,22 @@ AboutWidget::AboutWidget(QWidget *parent) mThirdParty->setObjectName(QString::fromUtf8("ThirdPartyBrowser")); QStringList parties; -#ifdef FRICTION_BUNDLE_SKIA_BUNDLE - parties << "skia_bundle"; +#if defined LINUX_DEPLOY + parties << "skia_bundle" << "qt" << "qscintilla" << "ffmpeg" << "unwind" << "xkbcommon"; +#elif defined WIN_DEPLOY + parties << "skia_bundle" << "qt" << "qscintilla" << "ffmpeg_win"; #else - parties << "skia"; -#endif -#ifdef FRICTION_BUNDLE_QT - parties << "qt"; -#endif -#ifdef FRICTION_BUNDLE_FFMPEG - parties << "ffmpeg"; -#endif -#ifdef FRICTION_BUNDLE_QSCINTILLA - parties << "qscintilla"; -#endif -#ifdef FRICTION_BUNDLE_GPERFTOOLS - parties << "gperftools"; + #ifdef FRICTION_BUNDLE_SKIA_BUNDLE + parties << "skia_bundle"; + #else + parties << "skia"; + #endif + #ifdef Q_OS_LINUX + parties << "gperftools"; + #endif #endif + + for (int i = 0; i < parties.size(); ++i) { QString doc = parties.at(i); QFile file(QString(":/docs/3rdparty/%1.html").arg(doc));