Skip to content

Commit

Permalink
Update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed Oct 29, 2023
1 parent 1b7e294 commit 8f7fbcb
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs
13 changes: 12 additions & 1 deletion src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
29 changes: 14 additions & 15 deletions src/app/GUI/aboutwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 8f7fbcb

Please sign in to comment.