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

Add several submodules from desktop-app.

This commit is contained in:
John Preston 2019-09-17 13:44:59 +03:00
parent daa33a5726
commit be9398b05a
15 changed files with 25 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitmodules vendored
View File

@ -10,9 +10,6 @@
[submodule "Telegram/ThirdParty/Catch"]
path = Telegram/ThirdParty/Catch
url = https://github.com/philsquared/Catch
[submodule "Telegram/ThirdParty/crl"]
path = Telegram/ThirdParty/crl
url = https://github.com/telegramdesktop/crl.git
[submodule "Telegram/ThirdParty/xxHash"]
path = Telegram/ThirdParty/xxHash
url = https://github.com/Cyan4973/xxHash.git
@ -22,3 +19,15 @@
[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
url = https://github.com/desktop-app/lib_crl.git
[submodule "Telegram/ThirdParty/lib_rpl"]
path = Telegram/ThirdParty/lib_rpl
url = https://github.com/desktop-app/lib_rpl.git
[submodule "Telegram/ThirdParty/lib_base"]
path = Telegram/ThirdParty/lib_base
url = https://github.com/desktop-app/lib_base.git
[submodule "Telegram/ThirdParty/gyp_helpers"]
path = Telegram/ThirdParty/gyp_helpers
url = https://github.com/desktop-app/gyp_helpers.git

1
Telegram/ThirdParty/crl vendored

@ -1 +0,0 @@
Subproject commit 52baf11aaeb7f5ea6955a438abaa1aee4c4308d8

1
Telegram/ThirdParty/gyp_helpers vendored Submodule

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

1
Telegram/ThirdParty/lib_base vendored Submodule

@ -0,0 +1 @@
Subproject commit 7a5fe257d9bffb813598913b5fc08f1725042099

1
Telegram/ThirdParty/lib_crl vendored Submodule

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

1
Telegram/ThirdParty/lib_rpl vendored Submodule

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

78
Telegram/gyp/crl.gyp
View File

@ -1,78 +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
{
'includes': [
'common/common.gypi',
],
'targets': [{
'target_name': 'crl',
'dependencies': [
],
'includes': [
'common/library.gypi',
'modules/qt.gypi',
],
'defines': [
],
'conditions': [[ 'build_macold', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
},
'include_dirs': [
'/usr/local/macold/include/c++/v1',
],
}]],
'variables': {
'crl_src_loc': '../ThirdParty/crl/src/crl',
'official_build_target%': '',
},
'include_dirs': [
'../ThirdParty/crl/src',
],
'sources': [
'<(crl_src_loc)/common/crl_common_config.h',
'<(crl_src_loc)/common/crl_common_list.cpp',
'<(crl_src_loc)/common/crl_common_list.h',
'<(crl_src_loc)/common/crl_common_on_main.cpp',
'<(crl_src_loc)/common/crl_common_on_main.h',
'<(crl_src_loc)/common/crl_common_on_main_guarded.h',
'<(crl_src_loc)/common/crl_common_queue.cpp',
'<(crl_src_loc)/common/crl_common_queue.h',
'<(crl_src_loc)/common/crl_common_sync.h',
'<(crl_src_loc)/common/crl_common_utils.h',
'<(crl_src_loc)/dispatch/crl_dispatch_async.cpp',
'<(crl_src_loc)/dispatch/crl_dispatch_async.h',
'<(crl_src_loc)/dispatch/crl_dispatch_on_main.h',
'<(crl_src_loc)/dispatch/crl_dispatch_queue.cpp',
'<(crl_src_loc)/dispatch/crl_dispatch_queue.h',
'<(crl_src_loc)/dispatch/crl_dispatch_semaphore.cpp',
'<(crl_src_loc)/dispatch/crl_dispatch_semaphore.h',
'<(crl_src_loc)/mac/crl_mac_time.cpp',
'<(crl_src_loc)/linux/crl_linux_time.cpp',
'<(crl_src_loc)/qt/crl_qt_async.cpp',
'<(crl_src_loc)/qt/crl_qt_async.h',
'<(crl_src_loc)/qt/crl_qt_semaphore.cpp',
'<(crl_src_loc)/qt/crl_qt_semaphore.h',
'<(crl_src_loc)/winapi/crl_winapi_async.cpp',
'<(crl_src_loc)/winapi/crl_winapi_async.h',
'<(crl_src_loc)/winapi/crl_winapi_dll.h',
'<(crl_src_loc)/winapi/crl_winapi_list.cpp',
'<(crl_src_loc)/winapi/crl_winapi_list.h',
'<(crl_src_loc)/winapi/crl_winapi_semaphore.cpp',
'<(crl_src_loc)/winapi/crl_winapi_semaphore.h',
'<(crl_src_loc)/winapi/crl_winapi_time.cpp',
'<(crl_src_loc)/crl.h',
'<(crl_src_loc)/crl_async.h',
'<(crl_src_loc)/crl_object_on_queue.h',
'<(crl_src_loc)/crl_on_main.h',
'<(crl_src_loc)/crl_queue.h',
'<(crl_src_loc)/crl_semaphore.h',
'<(crl_src_loc)/crl_time.cpp',
'<(crl_src_loc)/crl_time.h',
],
}],
}

6
Telegram/gyp/lib_base.gyp
View File

@ -28,7 +28,10 @@
'XXH_INLINE_ALL',
],
'dependencies': [
'crl.gyp:crl',
'../ThirdParty/crl/crl.gyp:crl',
],
'export_dependent_settings': [
'../ThirdParty/crl/crl.gyp:crl',
],
'include_dirs': [
'<(src_loc)',
@ -36,7 +39,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
'<(submodules_loc)/xxHash',
],
'sources': [

4
Telegram/gyp/lib_export.gyp
View File

@ -28,10 +28,11 @@
],
'dependencies': [
'lib_scheme.gyp:lib_scheme',
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'lib_scheme.gyp:lib_scheme',
'lib_base.gyp:lib_base',
],
'conditions': [[ 'build_macold', {
'xcode_settings': {
@ -47,7 +48,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
],
'sources': [
'<(src_loc)/export/export_api_wrap.cpp',

3
Telegram/gyp/lib_ffmpeg.gyp
View File

@ -21,11 +21,9 @@
'submodules_loc': '../ThirdParty',
},
'dependencies': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'defines': [
@ -37,7 +35,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
],
'sources': [
'<(src_loc)/ffmpeg/ffmpeg_utility.cpp',

3
Telegram/gyp/lib_lottie.gyp
View File

@ -24,14 +24,12 @@
'lz4_loc': '<(submodules_loc)/lz4/lib',
},
'dependencies': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_rlottie.gyp:lib_rlottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
'lib_lz4.gyp:lib_lz4',
],
'export_dependent_settings': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_rlottie.gyp:lib_rlottie',
'lib_ffmpeg.gyp:lib_ffmpeg',
@ -50,7 +48,6 @@
'<(lz4_loc)',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
],
'sources': [
'<(src_loc)/lottie/lottie_animation.cpp',

4
Telegram/gyp/lib_mtproto.gyp
View File

@ -28,10 +28,11 @@
],
'dependencies': [
'lib_scheme.gyp:lib_scheme',
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'lib_scheme.gyp:lib_scheme',
'lib_base.gyp:lib_base',
],
'conditions': [[ 'build_macold', {
'xcode_settings': {
@ -47,7 +48,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
],
'sources': [
'<(src_loc)/mtproto/mtp_abstract_socket.cpp',

3
Telegram/gyp/lib_storage.gyp
View File

@ -28,11 +28,9 @@
'XXH_INLINE_ALL',
],
'dependencies': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'export_dependent_settings': [
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'include_dirs': [
@ -41,7 +39,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
'<(submodules_loc)/xxHash',
],
'sources': [

3
Telegram/gyp/lib_ui.gyp
View File

@ -23,7 +23,7 @@
'dependencies': [
'codegen.gyp:codegen_emoji',
'codegen.gyp:codegen_style',
'crl.gyp:crl',
'lib_base.gyp:lib_base',
],
'variables': {
'src_loc': '../SourceFiles',
@ -59,7 +59,6 @@
'<(libs_loc)/range-v3/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
'<(emoji_suggestions_loc)',
],
'sources': [

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

@ -74,7 +74,6 @@
'tests/tests.gyp:tests',
'utils.gyp:Updater',
'../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
'crl.gyp:crl',
'lib_base.gyp:lib_base',
'lib_export.gyp:lib_export',
'lib_storage.gyp:lib_storage',