Update docs

friction2d · Oct 22, 2023 · 7d04015 · 7d04015
1 parent b1fb080
commit 7d04015
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/docs b/docs
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -52,6 +52,8 @@ if(${USE_SKIA_SYSTEM_LIBS})
     pkg_check_modules(ZLIB REQUIRED zlib)
     pkg_check_modules(ICU REQUIRED icu-i18n)
     pkg_check_modules(HARFBUZZ REQUIRED harfbuzz)
+else()
+    add_definitions(-DFRICTION_BUNDLE_SKIA_BUNDLE)
 endif()
 
 if(APPLE)
@@ -593,9 +595,6 @@ if(UNIX AND NOT APPLE)
         FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.md
         ${CMAKE_CURRENT_SOURCE_DIR}/../../README.md
-        ${CMAKE_BINARY_DIR}/LICENSE-gperftools.md
-        ${CMAKE_BINARY_DIR}/LICENSE-skia.md
-        ${CMAKE_BINARY_DIR}/README-easing.md
         DESTINATION
         ${CMAKE_INSTALL_DOCDIR}-${PROJECT_VERSION}
     )

diff --git a/src/app/GUI/aboutwidget.cpp b/src/app/GUI/aboutwidget.cpp
@@ -97,13 +97,17 @@ AboutWidget::AboutWidget(QWidget *parent)
         mTab->addTab(browser, tab.title);
     }
 
-    /*const auto mThirdParty = new QTabWidget(this);
+    const auto mThirdParty = new QTabWidget(this);
     mThirdParty->setTabPosition(QTabWidget::South);
     mThirdParty->setTabBarAutoHide(true);
     mThirdParty->setObjectName(QString::fromUtf8("ThirdPartyBrowser"));
 
     QStringList parties;
+#ifdef FRICTION_BUNDLE_SKIA_BUNDLE
+    parties << "skia_bundle";
+#else
     parties << "skia";
+#endif
 #ifdef FRICTION_BUNDLE_QT
     parties << "qt";
 #endif
@@ -118,9 +122,6 @@ AboutWidget::AboutWidget(QWidget *parent)
 #endif
     for (int i = 0; i < parties.size(); ++i) {
         QString doc = parties.at(i);
-#ifdef Q_OS_WIN
-        if (doc == "ffmpeg") { doc = "ffmpeg_win"; }
-#endif
         QFile file(QString(":/docs/3rdparty/%1.html").arg(doc));
         if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { continue; }
         const auto browser = new QTextBrowser(this);
@@ -130,7 +131,8 @@ AboutWidget::AboutWidget(QWidget *parent)
         html.append(file.readAll());
         browser->setHtml(html);
         file.close();
-        mThirdParty->addTab(browser, parties.at(i));
+        QString title = parties.at(i).split("_").takeFirst().toUpper();
+        mThirdParty->addTab(browser, title);
     }
-    mTab->addTab(mThirdParty, tr("Third-party"));*/
+    mTab->addTab(mThirdParty, tr("Third-party"));
 }
diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake
@@ -50,6 +50,7 @@ if(UNIX AND NOT APPLE)
     if(${STATIC_FFMPEG})
         set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
     endif()
+    add_definitions(-DFRICTION_BUNDLE_GPERFTOOLS)
 endif()
 
 if(NOT WIN32)
+42 −0		3rdparty/gperftools.html
+38 −0		3rdparty/gperftools.md
+688 −0		3rdparty/qscintilla.html
+682 −0		3rdparty/qscintilla.md
+1,451 −0		3rdparty/qt.html
+1,559 −0		3rdparty/qt.md
+40 −0		3rdparty/skia.html
+37 −0		3rdparty/skia.md
+985 −0		3rdparty/skia_bundle.html
+1,018 −0		3rdparty/skia_bundle.md
+1 −0		_config.yml
+1 −0		_includes/footer.html
+2 −0		assets/mastodon-white.svg
+5 −0		docs.qrc
+54 −42		documentation/shortcuts.md
+5 −0		genAppDocs.sh