summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Preston <johnprestonmail@gmail.com>2023-02-08 13:19:52 +0400
committerJohn Preston <johnprestonmail@gmail.com>2023-02-08 13:20:01 +0400
commit84b4ab1c3c5ea6582a4640bfee3ecccd8d68c98d (patch)
tree574cae1c86250c0dd1a9035d28196eab6c11ba04
parent9659cb5b6fc215aac7f01629812a8a61bea71bc3 (diff)
Version 4.6.2: Re-enable global /LTCG on Windows.
With /LTCGOUT: empty path it should not try generating .iobj file, and work on both 32 bit and 64 bit build with all static libs.
-rw-r--r--Telegram/CMakeLists.txt2
-rw-r--r--Telegram/cmake/lib_ffmpeg.cmake2
-rw-r--r--Telegram/cmake/td_mtproto.cmake2
-rw-r--r--Telegram/cmake/td_scheme.cmake2
-rw-r--r--Telegram/cmake/td_ui.cmake4
m---------Telegram/codegen0
m---------Telegram/lib_base0
m---------Telegram/lib_crl0
m---------Telegram/lib_lottie0
m---------Telegram/lib_ui0
m---------Telegram/lib_webrtc0
m---------cmake0
12 files changed, 6 insertions, 6 deletions
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 9233855599..d647177bd1 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -5,7 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
add_executable(Telegram WIN32 MACOSX_BUNDLE)
-init_non_host_target(Telegram ltcg)
+init_non_host_target(Telegram)
add_subdirectory(lib_rpl)
add_subdirectory(lib_crl)
diff --git a/Telegram/cmake/lib_ffmpeg.cmake b/Telegram/cmake/lib_ffmpeg.cmake
index 7e982d9c00..7416fa8739 100644
--- a/Telegram/cmake/lib_ffmpeg.cmake
+++ b/Telegram/cmake/lib_ffmpeg.cmake
@@ -6,7 +6,7 @@
add_library(lib_ffmpeg OBJECT)
add_library(desktop-app::lib_ffmpeg ALIAS lib_ffmpeg)
-init_target(lib_ffmpeg ltcg)
+init_target(lib_ffmpeg)
nice_target_sources(lib_ffmpeg ${src_loc}
PRIVATE
diff --git a/Telegram/cmake/td_mtproto.cmake b/Telegram/cmake/td_mtproto.cmake
index 65ad1b8a9a..79a0a3c76f 100644
--- a/Telegram/cmake/td_mtproto.cmake
+++ b/Telegram/cmake/td_mtproto.cmake
@@ -5,7 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
add_library(td_mtproto OBJECT)
-init_non_host_target(td_mtproto ltcg)
+init_non_host_target(td_mtproto)
add_library(tdesktop::td_mtproto ALIAS td_mtproto)
target_precompile_headers(td_mtproto PRIVATE ${src_loc}/mtproto/mtproto_pch.h)
diff --git a/Telegram/cmake/td_scheme.cmake b/Telegram/cmake/td_scheme.cmake
index 6818d24b0a..20b956382b 100644
--- a/Telegram/cmake/td_scheme.cmake
+++ b/Telegram/cmake/td_scheme.cmake
@@ -5,7 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
add_library(td_scheme OBJECT)
-init_non_host_target(td_scheme ltcg)
+init_non_host_target(td_scheme)
add_library(tdesktop::td_scheme ALIAS td_scheme)
include(cmake/generate_scheme.cmake)
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 4636aa044d..2153d77219 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -4,8 +4,8 @@
# For license and copyright information please follow this link:
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-add_library(td_ui STATIC)
-init_non_host_target(td_ui ltcg)
+add_library(td_ui OBJECT)
+init_non_host_target(td_ui)
add_library(tdesktop::td_ui ALIAS td_ui)
include(lib_ui/cmake/generate_styles.cmake)
diff --git a/Telegram/codegen b/Telegram/codegen
-Subproject 40d9bc8a644a5c51bb0790cf5f268e93a01fe59
+Subproject 1a969faa0afb29d53af03e530775eccdfb8433f
diff --git a/Telegram/lib_base b/Telegram/lib_base
-Subproject a2eb8075c2218a3d28a249fc913269fc1d8db0f
+Subproject 33d846fc2d88f577d89e7d359cde3fa0a22899e
diff --git a/Telegram/lib_crl b/Telegram/lib_crl
-Subproject 53d1322171ddfcfbce767cad1e2f0cb4efb9199
+Subproject 3d7e1e1f1321c3defd21c01882d674e485ecd8d
diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie
-Subproject 99d1d946633819e375f9ea5508a903d37fef714
+Subproject 3e9c2f1026e4b5aa3202fca4cc67ece36c7cebb
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
-Subproject 1b9b1739649ddf942937a6b9a1a22933070e5ec
+Subproject 66e47a0240251b50242b2a68413645b61fa28a9
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
-Subproject 853b9d8cbe02460f405ce1d13beb3a5be46a007
+Subproject b68a95ad4d1ae9a1827671100a7fd76cbe448c3
diff --git a/cmake b/cmake
-Subproject aa1e0d84b93e0901bb8db497e67276329ef9cc6
+Subproject 17951fb650e380364968ed4f208e589e2812be3