kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Updated cmake sources to TDesktop version 3.1.1+0984e63

Browse source
This commit is contained in:
Eric Kotato 2021-09-26 01:18:36 +03:00
commit f8a594be84
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/opus/CMakeLists.txt vendored
View file

@ -21,12 +21,7 @@ else()
INTERFACE INTERFACE
${libs_loc}/opus/include ${libs_loc}/opus/include
) )
if (build_win64) set(opus_lib_loc ${libs_loc}/opus/out)
set(opus_config_folder x64)
else()
set(opus_config_folder Win32)
endif()
set(opus_lib_loc ${libs_loc}/opus/win32/VS2015/${opus_config_folder})
set_target_properties(external_opus PROPERTIES set_target_properties(external_opus PROPERTIES
IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib" IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib"
IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib" IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib"

3
external/qt/CMakeLists.txt vendored
View file

@ -131,6 +131,7 @@ else()
endif() endif()
set(common_qt_libs set(common_qt_libs
plugins/bearer/${qt_lib_prefix}qgenericbearer
plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qwebp
plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qgif
plugins/imageformats/${qt_lib_prefix}qjpeg plugins/imageformats/${qt_lib_prefix}qjpeg
@ -175,7 +176,6 @@ else()
lib/${qt_lib_prefix}qtfreetype lib/${qt_lib_prefix}qtfreetype
lib/${qt_lib_prefix}qtpcre2 lib/${qt_lib_prefix}qtpcre2
plugins/platforms/${qt_lib_prefix}qcocoa plugins/platforms/${qt_lib_prefix}qcocoa
plugins/bearer/${qt_lib_prefix}qgenericbearer
) )
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
@ -228,7 +228,6 @@ else()
lib/${qt_lib_prefix}Qt5EdidSupport lib/${qt_lib_prefix}Qt5EdidSupport
lib/${qt_lib_prefix}Qt5XkbCommonSupport lib/${qt_lib_prefix}Qt5XkbCommonSupport
${qt_libs_dbus_support} ${qt_libs_dbus_support}
plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers} ${qt_libs_dbus_bearers}
${qt_libs_waylandclient} ${qt_libs_waylandclient}
lib/${qt_lib_prefix}Qt5ServiceSupport lib/${qt_lib_prefix}Qt5ServiceSupport

3
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -8,6 +8,7 @@ https://github.com/desktop-app/legal/blob/master/LEGAL
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#ifndef DESKTOP_APP_USE_PACKAGED #ifndef DESKTOP_APP_USE_PACKAGED
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QWebpPlugin)
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
@ -19,12 +20,10 @@ Q_IMPORT_PLUGIN(QGifPlugin)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#elif defined Q_OS_MAC // Q_OS_WIN #elif defined Q_OS_MAC // Q_OS_WIN
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
#elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
Q_IMPORT_PLUGIN(QSvgIconPlugin) Q_IMPORT_PLUGIN(QSvgIconPlugin)
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION