MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix folder structure for Xcode build.

This commit is contained in:
John Preston 2019-09-18 09:56:01 +03:00
parent 246c45ce0e
commit e3f5a505eb
29 changed files with 233 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.gitmodules vendored
View File

@ -19,21 +19,21 @@
[submodule "Telegram/ThirdParty/lz4"]
path = Telegram/ThirdParty/lz4
url = https://github.com/lz4/lz4.git
[submodule "Telegram/ThirdParty/lib_crl"]
path = Telegram/ThirdParty/lib_crl
[submodule "Telegram/lib_crl"]
path = Telegram/lib_crl
url = https://github.com/desktop-app/lib_crl.git
[submodule "Telegram/ThirdParty/lib_rpl"]
path = Telegram/ThirdParty/lib_rpl
[submodule "Telegram/lib_rpl"]
path = Telegram/lib_rpl
url = https://github.com/desktop-app/lib_rpl.git
[submodule "Telegram/ThirdParty/lib_base"]
path = Telegram/ThirdParty/lib_base
[submodule "Telegram/lib_base"]
path = Telegram/lib_base
url = https://github.com/desktop-app/lib_base.git
[submodule "Telegram/ThirdParty/gyp_helpers"]
path = Telegram/ThirdParty/gyp_helpers
[submodule "Telegram/gyp/helpers"]
path = Telegram/gyp/helpers
url = https://github.com/desktop-app/gyp_helpers.git
[submodule "Telegram/ThirdParty/codegen"]
path = Telegram/ThirdParty/codegen
[submodule "Telegram/codegen"]
path = Telegram/codegen
url = https://github.com/desktop-app/codegen.git
[submodule "Telegram/ThirdParty/lib_ui"]
path = Telegram/ThirdParty/lib_ui
[submodule "Telegram/lib_ui"]
path = Telegram/lib_ui
url = https://github.com/desktop-app/lib_ui.git

1
Telegram/ThirdParty/codegen vendored

@ -1 +0,0 @@
Subproject commit 1fd52233329a60f3e6a0c389873dfffc1ce403c8

1
Telegram/ThirdParty/gyp_helpers vendored

@ -1 +0,0 @@
Subproject commit df28126a0916edaa6b9c5d7a3ee2a0a71012308c

1
Telegram/ThirdParty/lib_base vendored

@ -1 +0,0 @@
Subproject commit 349996d274cc3820a79757ba903803f075a5f61d

1
Telegram/ThirdParty/lib_crl vendored

@ -1 +0,0 @@
Subproject commit 83ce4916d4f712300b7550900c59d3d0d420178b

1
Telegram/ThirdParty/lib_rpl vendored

@ -1 +0,0 @@
Subproject commit 93465f7854012f2237452f5eaddc5edcc7de2d48

1
Telegram/ThirdParty/lib_ui vendored

@ -1 +0,0 @@
Subproject commit 9c711cca1a02fe8d3fce5976a3d8afc30f7eb7f4

1
Telegram/codegen Submodule

@ -0,0 +1 @@
Subproject commit 01722893988a6573e1ba910028fbc0c596c2ae5b

127
Telegram/gyp/Telegram.gyp
View File

@ -6,7 +6,130 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'telegram/telegram.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'Telegram',
'variables': {
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
'minizip_loc': '<(third_party_loc)/minizip',
'sp_media_key_tap_loc': '<(third_party_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(third_party_loc)/emoji_suggestions',
'style_files': [
'<(src_loc)/boxes/boxes.style',
'<(src_loc)/calls/calls.style',
'<(src_loc)/dialogs/dialogs.style',
'<(src_loc)/export/view/export.style',
'<(src_loc)/history/history.style',
'<(src_loc)/info/info.style',
'<(src_loc)/intro/intro.style',
'<(src_loc)/media/view/mediaview.style',
'<(src_loc)/media/player/media_player.style',
'<(src_loc)/overview/overview.style',
'<(src_loc)/passport/passport.style',
'<(src_loc)/profile/profile.style',
'<(src_loc)/settings/settings.style',
'<(src_loc)/chat_helpers/chat_helpers.style',
'<(src_loc)/window/window.style',
],
'dependent_style_files': [
'<(submodules_loc)/lib_ui/ui/colors.palette',
'<(submodules_loc)/lib_ui/ui/basic.style',
'<(submodules_loc)/lib_ui/ui/widgets/widgets.style',
],
'style_timestamp': '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
'qrc_timestamp': '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
'langpacks': [
'en',
'de',
'es',
'it',
'nl',
'ko',
'pt-BR',
],
'build_defines%': '',
'list_sources_command': 'python <(submodules_loc)/lib_base/gyp/list_sources.py --input <(DEPTH)/telegram/sources.txt --replace src_loc=<(src_loc)',
'pch_source': '<(src_loc)/stdafx.cpp',
'pch_header': '<(src_loc)/stdafx.h',
},
'includes': [
'helpers/common/executable.gypi',
'helpers/modules/openssl.gypi',
'helpers/modules/qt.gypi',
'helpers/modules/qt_moc.gypi',
'helpers/modules/pch.gypi',
'../lib_ui/gyp/qrc_rule.gypi',
'../lib_ui/gyp/styles_rule.gypi',
'telegram/qrc.gypi',
'telegram/win.gypi',
'telegram/mac.gypi',
'telegram/linux.gypi',
'codegen/rules.gypi',
],
'dependencies': [
'<(submodules_loc)/codegen/codegen.gyp:codegen_lang',
'<(submodules_loc)/codegen/codegen.gyp:codegen_numbers',
'<(submodules_loc)/codegen/codegen.gyp:codegen_style',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_ui/lib_ui.gyp:lib_ui',
'<(third_party_loc)/libtgvoip/libtgvoip.gyp:libtgvoip',
'tests/tests.gyp:tests',
'utils.gyp:Updater',
'lib_export.gyp:lib_export',
'lib_storage.gyp:lib_storage',
'lib_lottie.gyp:lib_lottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
'lib_mtproto.gyp:lib_mtproto',
],
'defines': [
'AL_LIBTYPE_STATIC',
'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB',
'TDESKTOP_API_ID=<(api_id)',
'TDESKTOP_API_HASH=<(api_hash)',
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
],
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
'<(libs_loc)/breakpad/src',
'<(libs_loc)/lzma/C',
'<(libs_loc)/zlib',
'<(libs_loc)/openal-soft/include',
'<(libs_loc)/opus/include',
'<(minizip_loc)',
'<(sp_media_key_tap_loc)',
'<(emoji_suggestions_loc)',
],
'sources': [
'<@(qrc_files)',
'<@(style_files)',
'<(res_loc)/langs/cloud_lang.strings',
'<(res_loc)/export_html/css/style.css',
'<(res_loc)/export_html/js/script.js',
'<(res_loc)/export_html/images/back.png',
'<(res_loc)/export_html/images/back@2x.png',
'<(DEPTH)/telegram/sources.txt',
'<!@(<(list_sources_command) <(qt_moc_list_sources_arg))',
],
'sources!': [
'<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))',
],
'conditions': [
[ '"<(official_build_target)" != ""', {
'defines': [
'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
'TDESKTOP_FORCE_GTK_FILE_DIALOG',
],
'dependencies': [
'utils.gyp:Packer',
],
}],
],
}],
}

1
Telegram/gyp/helpers Submodule

@ -0,0 +1 @@
Subproject commit 85d6a5afc029d398411aac27c02970f00132bc42

12
Telegram/gyp/lib_export.gyp
View File

@ -6,15 +6,15 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_export',
'type': 'static_library',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'../ThirdParty/gyp_helpers/modules/pch.gypi',
'helpers/common/library.gypi',
'helpers/modules/qt.gypi',
'helpers/modules/pch.gypi',
],
'variables': {
'src_loc': '../SourceFiles',
@ -27,11 +27,11 @@
],
'dependencies': [
'lib_scheme.gyp:lib_scheme',
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'lib_scheme.gyp:lib_scheme',
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'conditions': [[ 'build_macold', {
'xcode_settings': {

15
Telegram/gyp/lib_ffmpeg.gyp
View File

@ -6,23 +6,23 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_ffmpeg',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'helpers/common/library.gypi',
'helpers/modules/qt.gypi',
],
'variables': {
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
},
'dependencies': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'defines': [
],
@ -30,6 +30,11 @@
'<(src_loc)',
'<(libs_loc)/ffmpeg',
],
'direct_dependent_settings': {
'include_dirs': [
'<(libs_loc)/ffmpeg',
],
},
'sources': [
'<(src_loc)/ffmpeg/ffmpeg_utility.cpp',
'<(src_loc)/ffmpeg/ffmpeg_utility.h',

17
Telegram/gyp/lib_lottie.gyp
View File

@ -6,29 +6,27 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_lottie',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/openssl.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'helpers/common/library.gypi',
'helpers/modules/openssl.gypi',
'helpers/modules/qt.gypi',
],
'variables': {
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
'rlottie_loc': '<(submodules_loc)/rlottie/inc',
'lz4_loc': '<(submodules_loc)/lz4/lib',
},
'dependencies': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
'lib_rlottie.gyp:lib_rlottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
'lib_lz4.gyp:lib_lz4',
],
'export_dependent_settings': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
'lib_rlottie.gyp:lib_rlottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
'lib_lz4.gyp:lib_lz4',
@ -39,9 +37,6 @@
'include_dirs': [
'<(src_loc)',
'<(libs_loc)/zlib',
'<(libs_loc)/ffmpeg',
'<(rlottie_loc)',
'<(lz4_loc)',
],
'sources': [
'<(src_loc)/lottie/lottie_animation.cpp',

11
Telegram/gyp/lib_lz4.gyp
View File

@ -6,22 +6,27 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_lz4',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'helpers/common/library.gypi',
],
'variables': {
'official_build_target%': '',
'lz4_loc': '<(submodules_loc)/lz4/lib',
'lz4_loc': '<(third_party_loc)/lz4/lib',
},
'defines': [
],
'include_dirs': [
'<(lz4_loc)',
],
'direct_dependent_settings': {
'include_dirs': [
'<(lz4_loc)',
],
},
'sources': [
'<(lz4_loc)/lz4.c',
'<(lz4_loc)/lz4.h',

10
Telegram/gyp/lib_mtproto.gyp
View File

@ -6,15 +6,15 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_mtproto',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'../ThirdParty/gyp_helpers/modules/pch.gypi',
'../ThirdParty/gyp_helpers/modules/openssl.gypi',
'helpers/common/library.gypi',
'helpers/modules/qt.gypi',
'helpers/modules/pch.gypi',
'helpers/modules/openssl.gypi',
],
'variables': {
'src_loc': '../SourceFiles',

11
Telegram/gyp/lib_rlottie.gyp
View File

@ -6,7 +6,7 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'variables': {
'build_standard_win': 'c++14',
@ -14,11 +14,11 @@
'targets': [{
'target_name': 'lib_rlottie',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'helpers/common/library.gypi',
],
'variables': {
'build_standard_win': 'c++14',
'rlottie_loc': '<(submodules_loc)/rlottie',
'rlottie_loc': '<(third_party_loc)/rlottie',
'rlottie_src': '<(rlottie_loc)/src',
},
'defines': [
@ -33,6 +33,11 @@
'<(rlottie_src)/vector/pixman',
'<(rlottie_src)/vector/freetype',
],
'direct_dependent_settings': {
'include_dirs': [
'<(rlottie_loc)/inc',
],
},
'sources': [
'<(rlottie_loc)/inc/rlottie.h',
'<(rlottie_loc)/inc/rlottie_capi.h',

10
Telegram/gyp/lib_scheme.gyp
View File

@ -6,14 +6,14 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_scheme',
'hard_dependency': 1,
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'helpers/common/library.gypi',
'helpers/modules/qt.gypi',
],
'variables': {
'src_loc': '../SourceFiles',
@ -30,10 +30,10 @@
],
}]],
'dependencies': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'include_dirs': [
'<(src_loc)',

16
Telegram/gyp/lib_storage.gyp
View File

@ -6,15 +6,15 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'lib_storage',
'includes': [
'../ThirdParty/gyp_helpers/common/library.gypi',
'../ThirdParty/gyp_helpers/modules/openssl.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'../ThirdParty/gyp_helpers/modules/pch.gypi',
'helpers/common/library.gypi',
'helpers/modules/openssl.gypi',
'helpers/modules/qt.gypi',
'helpers/modules/pch.gypi',
],
'variables': {
'src_loc': '../SourceFiles',
@ -26,14 +26,14 @@
'XXH_INLINE_ALL',
],
'dependencies': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'include_dirs': [
'<(src_loc)',
'<(submodules_loc)/xxHash',
'<(third_party_loc)/xxHash',
],
'sources': [
'<(src_loc)/storage/storage_clear_legacy.cpp',

8
Telegram/gyp/linux_glibc_wraps.gyp
View File

@ -6,21 +6,21 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'linux_glibc_wraps',
'type': 'static_library',
'sources': [
'../SourceFiles/platform/linux/linux_glibc_wraps.c',
'<(src_loc)/platform/linux/linux_glibc_wraps.c',
],
'conditions': [[ '"<!(uname -m)" == "x86_64" or "<!(uname -m)" == "aarch64"', {
'sources': [
'../SourceFiles/platform/linux/linux_glibc_wraps_64.c',
'<(src_loc)/platform/linux/linux_glibc_wraps_64.c',
],
}, {
'sources': [
'../SourceFiles/platform/linux/linux_glibc_wraps_32.c',
'<(src_loc)/platform/linux/linux_glibc_wraps_32.c',
],
}]],
}],

4
Telegram/gyp/telegram/linux.gypi
View File

@ -19,7 +19,11 @@
#'xkbcommon',
],
},
'dependencies': [
'<(DEPTH)/linux_glibc_wraps.gyp:linux_glibc_wraps',
],
'libraries': [
'<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
'-lbreakpad_client',
'-lcomposeplatforminputcontextplugin',
'-libusplatforminputcontextplugin',

16
Telegram/gyp/telegram/mac.gypi
View File

@ -6,10 +6,17 @@
{
'conditions': [[ 'build_mac', {
'mac_hardened_runtime': 1,
'mac_bundle': '1',
'mac_bundle_resources': [
'<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
'../Telegram/Images.xcassets',
],
'xcode_settings': {
'INFOPLIST_FILE': '../Telegram.plist',
'CURRENT_PROJECT_VERSION': '<!(./print_version.sh)',
'ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon',
'ENABLE_HARDENED_RUNTIME': 'YES',
'OTHER_LDFLAGS': [
'-lbsm',
'-lm',
@ -22,6 +29,9 @@
'library_dirs': [
'/usr/local/lib',
],
'sources': [
'../Telegram/Telegram.entitlements',
],
'configurations': {
'Debug': {
'xcode_settings': {
@ -185,6 +195,12 @@
],
}],
}], [ 'build_macstore', {
'mac_sandbox': 1,
'mac_sandbox_development_team': '6N38VWS5BX',
'product_name': 'Telegram Desktop',
'sources': [
'../Telegram/Telegram Desktop.entitlements',
],
'xcode_settings': {
'PRODUCT_BUNDLE_IDENTIFIER': 'org.telegram.desktop',
'OTHER_LDFLAGS': [

156
Telegram/gyp/telegram/telegram.gypi
View File

@ -1,156 +0,0 @@
# This file is part of Telegram Desktop,
# the official desktop application for the Telegram messaging service.
#
# For license and copyright information please follow this link:
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
{
'targets': [{
'target_name': 'Telegram',
'variables': {
'src_loc': '../SourceFiles',
'res_loc': '../Resources',
'minizip_loc': '<(submodules_loc)/minizip',
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
'<(src_loc)/boxes/boxes.style',
'<(src_loc)/calls/calls.style',
'<(src_loc)/dialogs/dialogs.style',
'<(src_loc)/export/view/export.style',
'<(src_loc)/history/history.style',
'<(src_loc)/info/info.style',
'<(src_loc)/intro/intro.style',
'<(src_loc)/media/view/mediaview.style',
'<(src_loc)/media/player/media_player.style',
'<(src_loc)/overview/overview.style',
'<(src_loc)/passport/passport.style',
'<(src_loc)/profile/profile.style',
'<(src_loc)/settings/settings.style',
'<(src_loc)/chat_helpers/chat_helpers.style',
'<(src_loc)/window/window.style',
],
'dependent_style_files': [
'<(submodules_loc)/lib_ui/ui/colors.palette',
'<(submodules_loc)/lib_ui/ui/basic.style',
'<(submodules_loc)/lib_ui/ui/widgets/widgets.style',
],
'style_timestamp': '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
'qrc_timestamp': '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
'langpacks': [
'en',
'de',
'es',
'it',
'nl',
'ko',
'pt-BR',
],
'build_defines%': '',
'list_sources_command': 'python <(submodules_loc)/lib_base/gyp/list_sources.py --input <(DEPTH)/telegram/sources.txt --replace src_loc=<(src_loc)',
'pch_source': '<(src_loc)/stdafx.cpp',
'pch_header': '<(src_loc)/stdafx.h',
},
'includes': [
'../../ThirdParty/gyp_helpers/common/executable.gypi',
'../../ThirdParty/gyp_helpers/modules/openssl.gypi',
'../../ThirdParty/gyp_helpers/modules/qt.gypi',
'../../ThirdParty/gyp_helpers/modules/qt_moc.gypi',
'../../ThirdParty/gyp_helpers/modules/pch.gypi',
'../../ThirdParty/lib_ui/gyp/qrc_rule.gypi',
'../../ThirdParty/lib_ui/gyp/styles_rule.gypi',
'qrc.gypi',
'win.gypi',
'mac.gypi',
'linux.gypi',
'../codegen/rules.gypi',
],
'dependencies': [
'../ThirdParty/codegen/codegen.gyp:codegen_lang',
'../ThirdParty/codegen/codegen.gyp:codegen_numbers',
'../ThirdParty/codegen/codegen.gyp:codegen_style',
'../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
'../ThirdParty/lib_base/lib_base.gyp:lib_base',
'../ThirdParty/lib_ui/lib_ui.gyp:lib_ui',
'tests/tests.gyp:tests',
'utils.gyp:Updater',
'lib_export.gyp:lib_export',
'lib_storage.gyp:lib_storage',
'lib_lottie.gyp:lib_lottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
'lib_mtproto.gyp:lib_mtproto',
'lib_ui.gyp:lib_ui',
],
'defines': [
'AL_LIBTYPE_STATIC',
'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB',
'XXH_INLINE_ALL',
'TDESKTOP_API_ID=<(api_id)',
'TDESKTOP_API_HASH=<(api_hash)',
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
],
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
'<(libs_loc)/breakpad/src',
'<(libs_loc)/lzma/C',
'<(libs_loc)/zlib',
'<(libs_loc)/ffmpeg',
'<(libs_loc)/openal-soft/include',
'<(libs_loc)/opus/include',
'<(minizip_loc)',
'<(sp_media_key_tap_loc)',
'<(emoji_suggestions_loc)',
'<(submodules_loc)/xxHash',
],
'sources': [
'<@(qrc_files)',
'<@(style_files)',
'<(res_loc)/langs/cloud_lang.strings',
'<(res_loc)/export_html/css/style.css',
'<(res_loc)/export_html/js/script.js',
'<(res_loc)/export_html/images/back.png',
'<(res_loc)/export_html/images/back@2x.png',
'<(DEPTH)/telegram/sources.txt',
'<!@(<(list_sources_command) <(qt_moc_list_sources_arg))',
],
'sources!': [
'<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))',
],
'conditions': [
[ '"<(official_build_target)" != ""', {
'defines': [
'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
'TDESKTOP_FORCE_GTK_FILE_DIALOG',
],
'dependencies': [
'utils.gyp:Packer',
],
}], [ 'build_mac', {
'mac_hardened_runtime': 1,
'mac_bundle': '1',
'mac_bundle_resources': [
'<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
'../../Telegram/Images.xcassets',
],
'xcode_settings': {
'ENABLE_HARDENED_RUNTIME': 'YES',
},
'sources': [
'../../Telegram/Telegram.entitlements',
],
}], [ 'build_macstore', {
'mac_sandbox': 1,
'mac_sandbox_development_team': '6N38VWS5BX',
'product_name': 'Telegram Desktop',
'sources': [
'../../Telegram/Telegram Desktop.entitlements',
],
}],
],
}],
}

6
Telegram/gyp/tests/common_test.gypi
View File

@ -6,15 +6,15 @@
{
'includes': [
'../../ThirdParty/gyp_helpers/common/executable.gypi',
'../../ThirdParty/gyp_helpers/modules/qt.gypi',
'../helpers/common/executable.gypi',
'../helpers/modules/qt.gypi',
],
'dependencies': [
'<(submodules_loc)/lib_base/lib_base.gyp:lib_base',
],
'include_dirs': [
'<(src_loc)',
'<(submodules_loc)/Catch/include',
'<(third_party_loc)/Catch/include',
],
'sources': [
'<(submodules_loc)/lib_base/base/tests_main.cpp',

6
Telegram/gyp/tests/tests.gyp
View File

@ -6,7 +6,7 @@
{
'includes': [
'../../ThirdParty/gyp_helpers/common/common.gypi',
'../helpers/common/common.gypi',
],
'variables': {
'src_loc': '../../SourceFiles',
@ -19,7 +19,7 @@
'target_name': 'tests',
'type': 'none',
'includes': [
'../../ThirdParty/gyp_helpers/common/common.gypi',
'../helpers/common/common.gypi',
],
'dependencies': [
'<!@(<(list_tests_command))',
@ -122,7 +122,7 @@
'target_name': 'tests_storage',
'includes': [
'common_test.gypi',
'../../ThirdParty/gyp_helpers/modules/openssl.gypi',
'../helpers/modules/openssl.gypi',
],
'dependencies': [
'../lib_storage.gyp:lib_storage',

8
Telegram/gyp/utils.gyp
View File

@ -6,7 +6,7 @@
{
'includes': [
'../ThirdParty/gyp_helpers/common/common.gypi',
'helpers/common/common.gypi',
],
'targets': [{
'target_name': 'Updater',
@ -15,7 +15,7 @@
'res_loc': '../Resources',
},
'includes': [
'../ThirdParty/gyp_helpers/common/executable.gypi',
'helpers/common/executable.gypi',
],
'include_dirs': [
@ -60,8 +60,8 @@
'mac_target': '10.10',
},
'includes': [
'../ThirdParty/gyp_helpers/common/executable.gypi',
'../ThirdParty/gyp_helpers/modules/qt.gypi',
'helpers/common/executable.gypi',
'helpers/modules/qt.gypi',
],
'conditions': [
[ 'build_win', {

1
Telegram/lib_base Submodule

@ -0,0 +1 @@
Subproject commit c1b1450dc165bcdea96a99e3341ac29539022511

1
Telegram/lib_crl Submodule

@ -0,0 +1 @@
Subproject commit 378df3676fc578abbae120bcbc5b38c7263ecee3

1
Telegram/lib_rpl Submodule

@ -0,0 +1 @@
Subproject commit 01323035bcc9395525f851b4b208f09818ce65f1

1
Telegram/lib_ui Submodule

@ -0,0 +1 @@
Subproject commit 342fad864a30acc92f6cfc2cd5ad631c7133ee8f