diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh index ed3ec3dae9..0ac8f307b1 100755 --- a/Telegram/build/deploy.sh +++ b/Telegram/build/deploy.sh @@ -50,13 +50,13 @@ if [ "$BuildTarget" == "linux" ]; then echo "Deploying version $AppVersionStrFull for Linux 64bit.." UpdateFile="tlinuxupd$AppVersion" SetupFile="tsetup.$AppVersionStrFull.tar.xz" - ReleasePath="$HomePath/../Linux/Release" + ReleasePath="$HomePath/../out/Release" RemoteFolder="tlinux" elif [ "$BuildTarget" == "linux32" ]; then echo "Deploying version $AppVersionStrFull for Linux 32bit.." UpdateFile="tlinux32upd$AppVersion" SetupFile="tsetup32.$AppVersionStrFull.tar.xz" - ReleasePath="$HomePath/../Linux/Release" + ReleasePath="$HomePath/../out/Release" RemoteFolder="tlinux32" elif [ "$BuildTarget" == "mac" ]; then DeployMac="0" diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake index 691f0ae2b0..8b899e4676 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake @@ -134,7 +134,11 @@ function(add_precompiled_header _target _input) set(_pch_compile_flags) endif() separate_arguments(_pch_compile_flags) - list(APPEND _pch_compile_flags -Winvalid-pch -include "${_pchfile}") + if(_source MATCHES \\.\(cc|cxx|cpp\)$) + list(APPEND _pch_compile_flags -Winvalid-pch -include "${_pchfile}") + else() + list(APPEND _pch_compile_flags -Winvalid-pch "-I${_pch_binary_dir}") + endif() get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS) if(NOT _object_depends) diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 93cbf98c69..0e8db7009e 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -200,6 +200,7 @@ '<(src_loc)/core/qthelp_url.cpp', '<(src_loc)/core/qthelp_url.h', '<(src_loc)/core/vector_of_moveable.h', + '<(src_loc)/core/version.h', '<(src_loc)/data/data_abstract_structure.cpp', '<(src_loc)/data/data_abstract_structure.h', '<(src_loc)/data/data_drafts.cpp', @@ -456,19 +457,11 @@ '<(src_loc)/window/top_bar_widget.cpp', '<(src_loc)/window/top_bar_widget.h', ], - 'configurations': { - 'Release': { - 'conditions': [ - ['"<(official_build_target)" != ""', { - 'defines': [ - 'CUSTOM_API_ID', - ], - }], - ], - }, - }, 'conditions': [ [ '"<(official_build_target)" != ""', { + 'defines': [ + 'CUSTOM_API_ID', + ], 'dependencies': [ 'utils.gyp:Packer', ],