RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try linking some libs dynamically on Linux.

This commit is contained in:
John Preston 2020-01-31 16:31:08 +03:00
parent 68027fd23e
commit 28a567986d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -83,7 +83,7 @@ bool RunShellCommand(const QByteArray &command) {
}
void FallbackFontConfig() {
#ifndef DESKTOP_APP_USE_PACKAGED
#ifdef TDESKTOP_USE_FONT_CONFIG_FALLBACK
const auto custom = cWorkingDir() + "tdata/fc-custom-1.conf";
const auto finish = gsl::finally([&] {
if (QFile(custom).exists()) {
@ -118,7 +118,7 @@ void FallbackFontConfig() {
}
QFile(":/fc/fc-custom.conf").copy(custom);
#endif // !DESKTOP_APP_USE_PACKAGED
#endif // TDESKTOP_USE_FONT_CONFIG_FALLBACK
}
bool GenerateDesktopFile(const QString &targetPath, const QString &args) {

2
cmake

@ -1 +1 @@
Subproject commit 6eff82642be0dd58c5c31b9cf2f0a905d9cac4b9
Subproject commit 22b099429aa9368fe0339ee48bcf6dbcdd3ac8d5