From e3f5a505ebb375e1b43e2c852cd1668720ec3e0e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Sep 2019 09:56:01 +0300
Subject: [PATCH] Fix folder structure for Xcode build.

---
 .gitmodules                         |  24 ++---
 Telegram/ThirdParty/codegen         |   1 -
 Telegram/ThirdParty/gyp_helpers     |   1 -
 Telegram/ThirdParty/lib_base        |   1 -
 Telegram/ThirdParty/lib_crl         |   1 -
 Telegram/ThirdParty/lib_rpl         |   1 -
 Telegram/ThirdParty/lib_ui          |   1 -
 Telegram/codegen                    |   1 +
 Telegram/gyp/Telegram.gyp           | 127 +++++++++++++++++++++-
 Telegram/gyp/helpers                |   1 +
 Telegram/gyp/lib_export.gyp         |  12 +--
 Telegram/gyp/lib_ffmpeg.gyp         |  15 ++-
 Telegram/gyp/lib_lottie.gyp         |  17 ++-
 Telegram/gyp/lib_lz4.gyp            |  11 +-
 Telegram/gyp/lib_mtproto.gyp        |  10 +-
 Telegram/gyp/lib_rlottie.gyp        |  11 +-
 Telegram/gyp/lib_scheme.gyp         |  10 +-
 Telegram/gyp/lib_storage.gyp        |  16 +--
 Telegram/gyp/linux_glibc_wraps.gyp  |   8 +-
 Telegram/gyp/telegram/linux.gypi    |   4 +
 Telegram/gyp/telegram/mac.gypi      |  16 +++
 Telegram/gyp/telegram/telegram.gypi | 156 ----------------------------
 Telegram/gyp/tests/common_test.gypi |   6 +-
 Telegram/gyp/tests/tests.gyp        |   6 +-
 Telegram/gyp/utils.gyp              |   8 +-
 Telegram/lib_base                   |   1 +
 Telegram/lib_crl                    |   1 +
 Telegram/lib_rpl                    |   1 +
 Telegram/lib_ui                     |   1 +
 29 files changed, 233 insertions(+), 236 deletions(-)
 delete mode 160000 Telegram/ThirdParty/codegen
 delete mode 160000 Telegram/ThirdParty/gyp_helpers
 delete mode 160000 Telegram/ThirdParty/lib_base
 delete mode 160000 Telegram/ThirdParty/lib_crl
 delete mode 160000 Telegram/ThirdParty/lib_rpl
 delete mode 160000 Telegram/ThirdParty/lib_ui
 create mode 160000 Telegram/codegen
 create mode 160000 Telegram/gyp/helpers
 delete mode 100644 Telegram/gyp/telegram/telegram.gypi
 create mode 160000 Telegram/lib_base
 create mode 160000 Telegram/lib_crl
 create mode 160000 Telegram/lib_rpl
 create mode 160000 Telegram/lib_ui

diff --git a/.gitmodules b/.gitmodules
index 65ea7c340f..1c097c1d61 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/Telegram/ThirdParty/codegen b/Telegram/ThirdParty/codegen
deleted file mode 160000
index 1fd5223332..0000000000
--- a/Telegram/ThirdParty/codegen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fd52233329a60f3e6a0c389873dfffc1ce403c8
diff --git a/Telegram/ThirdParty/gyp_helpers b/Telegram/ThirdParty/gyp_helpers
deleted file mode 160000
index df28126a09..0000000000
--- a/Telegram/ThirdParty/gyp_helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df28126a0916edaa6b9c5d7a3ee2a0a71012308c
diff --git a/Telegram/ThirdParty/lib_base b/Telegram/ThirdParty/lib_base
deleted file mode 160000
index 349996d274..0000000000
--- a/Telegram/ThirdParty/lib_base
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 349996d274cc3820a79757ba903803f075a5f61d
diff --git a/Telegram/ThirdParty/lib_crl b/Telegram/ThirdParty/lib_crl
deleted file mode 160000
index 83ce4916d4..0000000000
--- a/Telegram/ThirdParty/lib_crl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 83ce4916d4f712300b7550900c59d3d0d420178b
diff --git a/Telegram/ThirdParty/lib_rpl b/Telegram/ThirdParty/lib_rpl
deleted file mode 160000
index 93465f7854..0000000000
--- a/Telegram/ThirdParty/lib_rpl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93465f7854012f2237452f5eaddc5edcc7de2d48
diff --git a/Telegram/ThirdParty/lib_ui b/Telegram/ThirdParty/lib_ui
deleted file mode 160000
index 9c711cca1a..0000000000
--- a/Telegram/ThirdParty/lib_ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c711cca1a02fe8d3fce5976a3d8afc30f7eb7f4
diff --git a/Telegram/codegen b/Telegram/codegen
new file mode 160000
index 0000000000..0172289398
--- /dev/null
+++ b/Telegram/codegen
@@ -0,0 +1 @@
+Subproject commit 01722893988a6573e1ba910028fbc0c596c2ae5b
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 40723b2557..4dedbfc4c3 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -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',
+        ],
+      }],
+    ],
+  }],
 }
diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers
new file mode 160000
index 0000000000..85d6a5afc0
--- /dev/null
+++ b/Telegram/gyp/helpers
@@ -0,0 +1 @@
+Subproject commit 85d6a5afc029d398411aac27c02970f00132bc42
diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp
index 934b91e99c..4692370f2b 100644
--- a/Telegram/gyp/lib_export.gyp
+++ b/Telegram/gyp/lib_export.gyp
@@ -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': {
diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
index a85444fc78..47e00d237c 100644
--- a/Telegram/gyp/lib_ffmpeg.gyp
+++ b/Telegram/gyp/lib_ffmpeg.gyp
@@ -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',
diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp
index cc9fe13305..ca4158a06e 100644
--- a/Telegram/gyp/lib_lottie.gyp
+++ b/Telegram/gyp/lib_lottie.gyp
@@ -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',
diff --git a/Telegram/gyp/lib_lz4.gyp b/Telegram/gyp/lib_lz4.gyp
index a15c4430d8..2328c0f543 100644
--- a/Telegram/gyp/lib_lz4.gyp
+++ b/Telegram/gyp/lib_lz4.gyp
@@ -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',
diff --git a/Telegram/gyp/lib_mtproto.gyp b/Telegram/gyp/lib_mtproto.gyp
index c2efba79d8..1d36ca3cf4 100644
--- a/Telegram/gyp/lib_mtproto.gyp
+++ b/Telegram/gyp/lib_mtproto.gyp
@@ -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',
diff --git a/Telegram/gyp/lib_rlottie.gyp b/Telegram/gyp/lib_rlottie.gyp
index 5c10af07e7..44634c7be5 100644
--- a/Telegram/gyp/lib_rlottie.gyp
+++ b/Telegram/gyp/lib_rlottie.gyp
@@ -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',
diff --git a/Telegram/gyp/lib_scheme.gyp b/Telegram/gyp/lib_scheme.gyp
index efc9aa181c..d9ec6806ce 100644
--- a/Telegram/gyp/lib_scheme.gyp
+++ b/Telegram/gyp/lib_scheme.gyp
@@ -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)',
diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp
index 96baeac91a..1a9e79af3d 100644
--- a/Telegram/gyp/lib_storage.gyp
+++ b/Telegram/gyp/lib_storage.gyp
@@ -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',
diff --git a/Telegram/gyp/linux_glibc_wraps.gyp b/Telegram/gyp/linux_glibc_wraps.gyp
index 2ec84f338e..d40a915159 100644
--- a/Telegram/gyp/linux_glibc_wraps.gyp
+++ b/Telegram/gyp/linux_glibc_wraps.gyp
@@ -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',
       ],
     }]],
   }],
diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
index 385f2b89f0..0699b06382 100644
--- a/Telegram/gyp/telegram/linux.gypi
+++ b/Telegram/gyp/telegram/linux.gypi
@@ -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',
diff --git a/Telegram/gyp/telegram/mac.gypi b/Telegram/gyp/telegram/mac.gypi
index 50b99fefc4..1e97c5706d 100644
--- a/Telegram/gyp/telegram/mac.gypi
+++ b/Telegram/gyp/telegram/mac.gypi
@@ -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': [
diff --git a/Telegram/gyp/telegram/telegram.gypi b/Telegram/gyp/telegram/telegram.gypi
deleted file mode 100644
index 093f42d4f5..0000000000
--- a/Telegram/gyp/telegram/telegram.gypi
+++ /dev/null
@@ -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',
-        ],
-      }],
-    ],
-  }],
-}
diff --git a/Telegram/gyp/tests/common_test.gypi b/Telegram/gyp/tests/common_test.gypi
index 0ed7b4cb3c..c2fb1305a1 100644
--- a/Telegram/gyp/tests/common_test.gypi
+++ b/Telegram/gyp/tests/common_test.gypi
@@ -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',
diff --git a/Telegram/gyp/tests/tests.gyp b/Telegram/gyp/tests/tests.gyp
index cfbe2ee4f0..5281455452 100644
--- a/Telegram/gyp/tests/tests.gyp
+++ b/Telegram/gyp/tests/tests.gyp
@@ -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',
diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
index a0e16179a7..15c5f65ae7 100644
--- a/Telegram/gyp/utils.gyp
+++ b/Telegram/gyp/utils.gyp
@@ -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', {
diff --git a/Telegram/lib_base b/Telegram/lib_base
new file mode 160000
index 0000000000..c1b1450dc1
--- /dev/null
+++ b/Telegram/lib_base
@@ -0,0 +1 @@
+Subproject commit c1b1450dc165bcdea96a99e3341ac29539022511
diff --git a/Telegram/lib_crl b/Telegram/lib_crl
new file mode 160000
index 0000000000..378df3676f
--- /dev/null
+++ b/Telegram/lib_crl
@@ -0,0 +1 @@
+Subproject commit 378df3676fc578abbae120bcbc5b38c7263ecee3
diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl
new file mode 160000
index 0000000000..01323035bc
--- /dev/null
+++ b/Telegram/lib_rpl
@@ -0,0 +1 @@
+Subproject commit 01323035bcc9395525f851b4b208f09818ce65f1
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
new file mode 160000
index 0000000000..342fad864a
--- /dev/null
+++ b/Telegram/lib_ui
@@ -0,0 +1 @@
+Subproject commit 342fad864a30acc92f6cfc2cd5ad631c7133ee8f