diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 9c69674..13f3981 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -4,32 +4,39 @@
 # For license and copyright information please follow this link:
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
-add_subdirectory(auto_updates)
-add_subdirectory(crash_reports)
+macro(add_checked_subdirectory name)
+    if (NOT DEFINED desktop_app_skip_libs
+        OR NOT ${name} IN_LIST desktop_app_skip_libs)
+        add_subdirectory(${name})
+    endif()
+endmacro()
+
+add_checked_subdirectory(auto_updates)
+add_checked_subdirectory(crash_reports)
 if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-    add_subdirectory(dbusmenu_qt)
+    add_checked_subdirectory(dbusmenu_qt)
 endif()
-add_subdirectory(expected)
-add_subdirectory(ffmpeg)
-add_subdirectory(gsl)
+add_checked_subdirectory(expected)
+add_checked_subdirectory(ffmpeg)
+add_checked_subdirectory(gsl)
 if (add_hunspell_library)
-	add_subdirectory(hunspell)
+	add_checked_subdirectory(hunspell)
 endif()
-add_subdirectory(iconv)
-add_subdirectory(lz4)
-add_subdirectory(openal)
-add_subdirectory(openssl)
-add_subdirectory(opus)
-add_subdirectory(qt)
-add_subdirectory(qr_code_generator)
-add_subdirectory(ranges)
-add_subdirectory(rlottie)
+add_checked_subdirectory(iconv)
+add_checked_subdirectory(lz4)
+add_checked_subdirectory(openal)
+add_checked_subdirectory(openssl)
+add_checked_subdirectory(opus)
+add_checked_subdirectory(qt)
+add_checked_subdirectory(qr_code_generator)
+add_checked_subdirectory(ranges)
+add_checked_subdirectory(rlottie)
 if (APPLE)
-    add_subdirectory(sp_media_key_tap)
+    add_checked_subdirectory(sp_media_key_tap)
 endif()
 if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-    add_subdirectory(statusnotifieritem)
+    add_checked_subdirectory(statusnotifieritem)
 endif()
-add_subdirectory(variant)
-add_subdirectory(xxhash)
-add_subdirectory(zlib)
+add_checked_subdirectory(variant)
+add_checked_subdirectory(xxhash)
+add_checked_subdirectory(zlib)
diff --git a/options_win.cmake b/options_win.cmake
index 46443df..21195e2 100644
--- a/options_win.cmake
+++ b/options_win.cmake
@@ -64,6 +64,7 @@ INTERFACE
     DbgHelp
     Rstrtmgr
     Crypt32
+    Normaliz
 )
 
 if (build_winstore)
diff --git a/variables.cmake b/variables.cmake
index 3c71216..cb3303a 100644
--- a/variables.cmake
+++ b/variables.cmake
@@ -93,5 +93,3 @@ if (NOT APPLE OR build_osx)
 else()
     get_filename_component(libs_loc "../Libraries/macos" REALPATH)
 endif()
-get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
-get_filename_component(submodules_loc "Telegram" REALPATH)