diff --git a/.gitmodules b/.gitmodules index d75517c26..2190249af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,6 @@ [submodule "Telegram/lib_base"] path = Telegram/lib_base url = https://github.com/desktop-app/lib_base.git -[submodule "Telegram/gyp/helpers"] - path = Telegram/gyp/helpers - url = https://github.com/desktop-app/gyp_helpers.git [submodule "Telegram/codegen"] path = Telegram/codegen url = https://github.com/desktop-app/codegen.git diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index debda1aa5..ade4434f1 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit debda1aa5ee65d5ee43e32a1b981ece993e7f5c3 +Subproject commit ade4434f1c6efabecc3b548ca1f692f8d103d22a diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake index a9a0f7c22..215ac732e 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -742,6 +742,7 @@ else() PRIVATE /wd4005 /wd4244 # conversion from 'int' to 'float', possible loss of data (several in webrtc) + /wd5055 # operator '>' deprecated between enumerations and floating-point types ) target_compile_definitions(lib_tgvoip PUBLIC diff --git a/Telegram/codegen b/Telegram/codegen index d14ae77ad..d3cc39497 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit d14ae77ad5ed27ca6ddbc9579c0c5e0afa18ffca +Subproject commit d3cc394974bbaa48159261786edd2e543216c84b diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp deleted file mode 100644 index cc113bdd4..000000000 --- a/Telegram/gyp/Telegram.gyp +++ /dev/null @@ -1,141 +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': [ - '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/layers/layers.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', - ], - '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', - '<(submodules_loc)/lib_qr/lib_qr.gyp:lib_qr', - '<(third_party_loc)/libtgvoip/libtgvoip.gyp:libtgvoip', - '<(submodules_loc)/lib_lottie/lib_lottie.gyp:lib_lottie', - 'tests/tests.gyp:tests', - 'utils.gyp:Updater', - 'lib_export.gyp:lib_export', - 'lib_storage.gyp:lib_storage', - '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)', - ' To build your version of Telegram Desktop you're required to provide -> your own 'api_id' and 'api_hash' for the Telegram API access. -> -> How to obtain your 'api_id' and 'api_hash' is described here: -> https://core.telegram.org/api/obtaining_api_id -> -> If you're building the application not for deployment, -> but only for test purposes you can use TEST ONLY credentials, -> which are very limited by the Telegram API server: -> -> api_id: 17349 -> api_hash: 344583e45741c457fe1862106095a5eb -> -> Your users will start getting internal server errors on login -> if you deploy an app using those 'api_id' and 'api_hash'.""") - finish(0) - -gypScript = 'gyp' -gypFormats = [] -gypArguments = [] -cmakeConfigurations = [] -gypArguments.append('--depth=.') -gypArguments.append('--generator-output=..') -gypArguments.append('-Goutput_dir=../out') -gypArguments.append('-Dapi_id=' + apiId) -gypArguments.append('-Dapi_hash=' + apiHash) -gypArguments.append('-Dlottie_use_cache=1') -gypArguments.append('-Dspecial_build_target=' + officialTarget) -if ciBuild: - gypArguments.append('-Dci_build=1') - -if 'TDESKTOP_BUILD_DEFINES' in os.environ: - buildDefines = os.environ['TDESKTOP_BUILD_DEFINES'] - gypArguments.append('-Dbuild_defines=' + buildDefines) - print('[INFO] Set build defines to ' + buildDefines) - -if sys.platform == 'win32': - gypFormats.append('ninja') - gypFormats.append('msvs-ninja') -elif sys.platform == 'darwin': - # use patched gyp with Xcode project generator - gypScript = '../../../Libraries/gyp/gyp' - gypArguments.append('-Gxcode_upgrade_check_project_version=1030') - gypFormats.append('xcode') -else: - gypScript = '../../../Libraries/gyp/gyp' - gypFormats.append('cmake') - cmakeConfigurations.append('Debug') - cmakeConfigurations.append('Release') - -os.chdir(scriptPath) -if sys.platform == 'darwin': - subprocess.call('mkdir -p ../../out', shell=True) -for format in gypFormats: - command = gypArguments[:] - command.insert(0, gypScript) - command.append('--format=' + format) - command.append('Telegram.gyp') - result = subprocess.call(' '.join(command), shell=True) - if result != 0: - print('[ERROR] Failed generating for format: ' + format) - finish(result) - -os.chdir(scriptPath + '/../../out') -for configuration in cmakeConfigurations: - os.chdir(configuration) - result = subprocess.call('cmake "-GCodeBlocks - Unix Makefiles" .', shell=True) - if result != 0: - print('[ERROR] Failed calling cmake for ' + configuration) - finish(result) - os.chdir('..') - -finish(0) diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers deleted file mode 160000 index 5b000acfb..000000000 --- a/Telegram/gyp/helpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b000acfb554e98b6575203cd84859bc4cc9d344 diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp deleted file mode 100644 index 6a25c7f64..000000000 --- a/Telegram/gyp/lib_export.gyp +++ /dev/null @@ -1,62 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_export', - 'type': 'static_library', - 'includes': [ - 'helpers/common/library.gypi', - 'helpers/modules/qt.gypi', - 'helpers/modules/pch.gypi', - ], - 'variables': { - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - 'pch_source': '<(src_loc)/export/export_pch.cpp', - 'pch_header': '<(src_loc)/export/export_pch.h', - }, - 'defines': [ - ], - 'dependencies': [ - 'lib_scheme.gyp:lib_scheme', - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'export_dependent_settings': [ - 'lib_scheme.gyp:lib_scheme', - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'include_dirs': [ - '<(src_loc)', - ], - 'sources': [ - '<(src_loc)/export/export_api_wrap.cpp', - '<(src_loc)/export/export_api_wrap.h', - '<(src_loc)/export/export_controller.cpp', - '<(src_loc)/export/export_controller.h', - '<(src_loc)/export/export_settings.cpp', - '<(src_loc)/export/export_settings.h', - '<(src_loc)/export/data/export_data_types.cpp', - '<(src_loc)/export/data/export_data_types.h', - '<(src_loc)/export/output/export_output_abstract.cpp', - '<(src_loc)/export/output/export_output_abstract.h', - '<(src_loc)/export/output/export_output_file.cpp', - '<(src_loc)/export/output/export_output_file.h', - '<(src_loc)/export/output/export_output_html.cpp', - '<(src_loc)/export/output/export_output_html.h', - '<(src_loc)/export/output/export_output_json.cpp', - '<(src_loc)/export/output/export_output_json.h', - '<(src_loc)/export/output/export_output_result.h', - '<(src_loc)/export/output/export_output_stats.cpp', - '<(src_loc)/export/output/export_output_stats.h', - '<(src_loc)/export/output/export_output_text.cpp', - '<(src_loc)/export/output/export_output_text.h', - ], - }], -} diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp deleted file mode 100644 index 87359f865..000000000 --- a/Telegram/gyp/lib_ffmpeg.gyp +++ /dev/null @@ -1,49 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_ffmpeg', - 'includes': [ - 'helpers/common/library.gypi', - 'helpers/modules/qt.gypi', - ], - 'variables': { - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - }, - 'dependencies': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'export_dependent_settings': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'defines': [ - ], - 'include_dirs': [ - '<(src_loc)', - '<(libs_loc)/ffmpeg', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(src_loc)', - '<(libs_loc)/ffmpeg', - ], - }, - 'sources': [ - '<(src_loc)/ffmpeg/ffmpeg_utility.cpp', - '<(src_loc)/ffmpeg/ffmpeg_utility.h', - ], - 'conditions': [[ '"<(special_build_target)" != ""', { - 'defines': [ - 'LIB_FFMPEG_USE_QT_PRIVATE_API', - ], - }]], - }], -} diff --git a/Telegram/gyp/lib_lz4.gyp b/Telegram/gyp/lib_lz4.gyp deleted file mode 100644 index 25909c4c7..000000000 --- a/Telegram/gyp/lib_lz4.gyp +++ /dev/null @@ -1,41 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_lz4', - 'includes': [ - 'helpers/common/library.gypi', - ], - 'variables': { - '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', - '<(lz4_loc)/lz4frame.c', - '<(lz4_loc)/lz4frame.h', - '<(lz4_loc)/lz4frame_static.h', - '<(lz4_loc)/lz4hc.c', - '<(lz4_loc)/lz4hc.h', - '<(lz4_loc)/xxhash.c', - '<(lz4_loc)/xxhash.h', - ], - }], -} diff --git a/Telegram/gyp/lib_mtproto.gyp b/Telegram/gyp/lib_mtproto.gyp deleted file mode 100644 index 5ca1ad191..000000000 --- a/Telegram/gyp/lib_mtproto.gyp +++ /dev/null @@ -1,73 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_mtproto', - 'includes': [ - 'helpers/common/library.gypi', - 'helpers/modules/qt.gypi', - 'helpers/modules/pch.gypi', - 'helpers/modules/openssl.gypi', - ], - 'variables': { - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - 'pch_source': '<(src_loc)/mtproto/mtproto_pch.cpp', - 'pch_header': '<(src_loc)/mtproto/mtproto_pch.h', - }, - 'defines': [ - ], - 'dependencies': [ - 'lib_scheme.gyp:lib_scheme', - ], - 'export_dependent_settings': [ - 'lib_scheme.gyp:lib_scheme', - ], - 'include_dirs': [ - '<(src_loc)', - ], - 'sources': [ - '<(src_loc)/mtproto/details/mtproto_abstract_socket.cpp', - '<(src_loc)/mtproto/details/mtproto_abstract_socket.h', - '<(src_loc)/mtproto/details/mtproto_bound_key_creator.cpp', - '<(src_loc)/mtproto/details/mtproto_bound_key_creator.h', - '<(src_loc)/mtproto/details/mtproto_dc_key_binder.cpp', - '<(src_loc)/mtproto/details/mtproto_dc_key_binder.h', - '<(src_loc)/mtproto/details/mtproto_dc_key_creator.cpp', - '<(src_loc)/mtproto/details/mtproto_dc_key_creator.h', - '<(src_loc)/mtproto/details/mtproto_dcenter.cpp', - '<(src_loc)/mtproto/details/mtproto_dcenter.h', - '<(src_loc)/mtproto/details/mtproto_domain_resolver.cpp', - '<(src_loc)/mtproto/details/mtproto_domain_resolver.h', - '<(src_loc)/mtproto/details/mtproto_dump_to_text.cpp', - '<(src_loc)/mtproto/details/mtproto_dump_to_text.h', - '<(src_loc)/mtproto/details/mtproto_received_ids_manager.cpp', - '<(src_loc)/mtproto/details/mtproto_received_ids_manager.h', - '<(src_loc)/mtproto/details/mtproto_rsa_public_key.cpp', - '<(src_loc)/mtproto/details/mtproto_rsa_public_key.h', - '<(src_loc)/mtproto/details/mtproto_serialized_request.cpp', - '<(src_loc)/mtproto/details/mtproto_serialized_request.h', - '<(src_loc)/mtproto/details/mtproto_tcp_socket.cpp', - '<(src_loc)/mtproto/details/mtproto_tcp_socket.h', - '<(src_loc)/mtproto/details/mtproto_tls_socket.cpp', - '<(src_loc)/mtproto/details/mtproto_tls_socket.h', - '<(src_loc)/mtproto/mtproto_auth_key.cpp', - '<(src_loc)/mtproto/mtproto_auth_key.h', - '<(src_loc)/mtproto/mtproto_concurrent_sender.cpp', - '<(src_loc)/mtproto/mtproto_concurrent_sender.h', - '<(src_loc)/mtproto/mtproto_dh_utils.cpp', - '<(src_loc)/mtproto/mtproto_dh_utils.h', - '<(src_loc)/mtproto/mtproto_proxy_data.cpp', - '<(src_loc)/mtproto/mtproto_proxy_data.h', - '<(src_loc)/mtproto/mtproto_rpc_sender.cpp', - '<(src_loc)/mtproto/mtproto_rpc_sender.h', - ], - }], -} diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp deleted file mode 100644 index 2975bc30f..000000000 --- a/Telegram/gyp/lib_scheme.gyp +++ /dev/null @@ -1,66 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_scheme', - 'hard_dependency': 1, - 'includes': [ - 'helpers/common/library.gypi', - 'helpers/modules/qt.gypi', - ], - 'variables': { - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - }, - 'defines': [ - ], - 'dependencies': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - '<(submodules_loc)/lib_tl/lib_tl.gyp:lib_tl', - ], - 'export_dependent_settings': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - '<(submodules_loc)/lib_tl/lib_tl.gyp:lib_tl', - ], - 'include_dirs': [ - '<(src_loc)', - '<(SHARED_INTERMEDIATE_DIR)', - '<(submodules_loc)/GSL/include', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - 'actions': [{ - 'action_name': 'codegen_scheme', - 'inputs': [ - '<(src_loc)/codegen/scheme/codegen_scheme.py', - '<(submodules_loc)/lib_tl/tl/generate_tl.py', - '<(res_loc)/tl/mtproto.tl', - '<(res_loc)/tl/api.tl', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/scheme.cpp', - '<(SHARED_INTERMEDIATE_DIR)/scheme.h', - '<(SHARED_INTERMEDIATE_DIR)/scheme-dump_to_text.cpp', - '<(SHARED_INTERMEDIATE_DIR)/scheme-dump_to_text.h', - ], - 'action': [ - 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', - '-o', '<(SHARED_INTERMEDIATE_DIR)/scheme', - '<(res_loc)/tl/mtproto.tl', - '<(res_loc)/tl/api.tl', - ], - 'message': 'codegen_scheme-ing *.tl..', - 'process_outputs_as_sources': 1, - }], - }], -} diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp deleted file mode 100644 index d32757623..000000000 --- a/Telegram/gyp/lib_storage.gyp +++ /dev/null @@ -1,77 +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': [ - 'helpers/common/common.gypi', - ], - 'targets': [{ - 'target_name': 'lib_storage', - 'includes': [ - 'helpers/common/library.gypi', - 'helpers/modules/openssl.gypi', - 'helpers/modules/qt.gypi', - 'helpers/modules/pch.gypi', - ], - 'variables': { - 'src_loc': '../SourceFiles', - 'res_loc': '../Resources', - 'pch_source': '<(src_loc)/storage/storage_pch.cpp', - 'pch_header': '<(src_loc)/storage/storage_pch.h', - }, - 'defines': [ - 'XXH_INLINE_ALL', - ], - 'dependencies': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'export_dependent_settings': [ - '<(submodules_loc)/lib_base/lib_base.gyp:lib_base', - ], - 'include_dirs': [ - '<(src_loc)', - '<(third_party_loc)/xxHash', - ], - 'sources': [ - '<(src_loc)/storage/storage_clear_legacy.cpp', - '<(src_loc)/storage/storage_clear_legacy_posix.cpp', - '<(src_loc)/storage/storage_clear_legacy_win.cpp', - '<(src_loc)/storage/storage_clear_legacy.h', - '<(src_loc)/storage/storage_databases.cpp', - '<(src_loc)/storage/storage_databases.h', - '<(src_loc)/storage/storage_encryption.cpp', - '<(src_loc)/storage/storage_encryption.h', - '<(src_loc)/storage/storage_encrypted_file.cpp', - '<(src_loc)/storage/storage_encrypted_file.h', - '<(src_loc)/storage/storage_file_lock_posix.cpp', - '<(src_loc)/storage/storage_file_lock_win.cpp', - '<(src_loc)/storage/storage_file_lock.h', - '<(src_loc)/storage/cache/storage_cache_binlog_reader.cpp', - '<(src_loc)/storage/cache/storage_cache_binlog_reader.h', - '<(src_loc)/storage/cache/storage_cache_cleaner.cpp', - '<(src_loc)/storage/cache/storage_cache_cleaner.h', - '<(src_loc)/storage/cache/storage_cache_compactor.cpp', - '<(src_loc)/storage/cache/storage_cache_compactor.h', - '<(src_loc)/storage/cache/storage_cache_database.cpp', - '<(src_loc)/storage/cache/storage_cache_database.h', - '<(src_loc)/storage/cache/storage_cache_database_object.cpp', - '<(src_loc)/storage/cache/storage_cache_database_object.h', - '<(src_loc)/storage/cache/storage_cache_types.cpp', - '<(src_loc)/storage/cache/storage_cache_types.h', - ], - 'conditions': [[ 'build_win', { - 'sources!': [ - '<(src_loc)/storage/storage_clear_legacy_posix.cpp', - '<(src_loc)/storage/storage_file_lock_posix.cpp', - ], - }, { - 'sources!': [ - '<(src_loc)/storage/storage_clear_legacy_win.cpp', - '<(src_loc)/storage/storage_file_lock_win.cpp', - ], - }]], - }], -} diff --git a/Telegram/gyp/print_version.sh b/Telegram/gyp/print_version.sh deleted file mode 100755 index 791a5318d..000000000 --- a/Telegram/gyp/print_version.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -e -FullExecPath=$PWD -pushd `dirname $0` > /dev/null -FullScriptPath=`pwd` -popd > /dev/null - -while IFS='' read -r line || [[ -n "$line" ]]; do - set $line - eval $1="$2" -done < "$FullScriptPath/../build/version" - -echo $AppVersionStr -exit - diff --git a/Telegram/gyp/refresh.bat b/Telegram/gyp/refresh.bat deleted file mode 100644 index 77aa7a2cb..000000000 --- a/Telegram/gyp/refresh.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo OFF - -setlocal enabledelayedexpansion -set "FullScriptPath=%~dp0" - -python %FullScriptPath%generate.py %1 %2 %3 %4 %5 %6 -if %errorlevel% neq 0 goto error - -exit /b - -:error -echo FAILED -exit /b 1 diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh deleted file mode 100755 index 5fb8f9320..000000000 --- a/Telegram/gyp/refresh.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -e - -pushd `dirname $0` > /dev/null -FullScriptPath=`pwd` -popd > /dev/null - -python $FullScriptPath/generate.py $1 $2 $3 $4 $5 $6 - -exit diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi deleted file mode 100644 index 59f6acc93..000000000 --- a/Telegram/gyp/telegram/linux.gypi +++ /dev/null @@ -1,100 +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 - -{ - 'conditions': [[ 'build_linux', { - 'variables': { - 'variables': { - 'build_defines%': '', - }, - 'not_need_gtk%': ' createPlatformIntegration -> QXcbIntegrationPlugin::create - #'xkbcommon', - ], - }, - 'libraries': [ - '-Wl,-Bstatic', - '-lbreakpad_client', - '-llzma', - '-lopenal', - '-lavformat', - '-lavcodec', - '-lswresample', - '-lswscale', - '-lavutil', - '-lopus', - '-lva-x11', - '-lva-drm', - '-lva', - '-lvdpau', - '-ldrm', - '-lz', - '-lXi', - '-lXext', - '-lXfixes', - '-lXrender', - '<(linux_lib_ssl)', - '<(linux_lib_crypto)', -# ' /dev/null --libs <@(pkgconfig_libs))', - ], - 'cflags_cc': [ - '-Wno-strict-overflow', - '-Wno-maybe-uninitialized', - ], - 'ldflags': [ - '-Wl,-wrap,aligned_alloc', - '-Wl,-wrap,secure_getenv', - '-Wl,-wrap,clock_gettime', - '-Wl,--no-as-needed,-lrt', - '-Wl,-Bstatic', - ], - 'configurations': { - 'Release': { - 'cflags_c': [ - '-Ofast', - '-fno-strict-aliasing', - ], - 'cflags_cc': [ - '-Ofast', - '-fno-strict-aliasing', - ], - 'ldflags': [ - '-Ofast', - ], - }, - }, - 'conditions': [ - [ '" /dev/null --cflags gtk+-2.0)', - ' /dev/null --cflags glib-2.0)', - ], - }], ['