From ed2cceec574eae59251080207bb55db8cb12ad41 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Sat, 27 Oct 2018 10:26:20 +0300 Subject: [PATCH] Update config.h.in --- Telegram/CMakeLists.txt | 3 --- Telegram/SourceFiles/config.h.in | 11 +++++++--- Telegram/SourceFiles/core/version.h | 31 ----------------------------- 3 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 Telegram/SourceFiles/core/version.h diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index c0b8c924b..8b31a6613 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -167,9 +167,6 @@ endforeach() ##================================================ ## Branding ##================================================ -set(KEPKA_APPNAME "Kepka" - CACHE STRING "Application name") - configure_file(SourceFiles/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) ##================================================ diff --git a/Telegram/SourceFiles/config.h.in b/Telegram/SourceFiles/config.h.in index 00ddc6153..2973996b1 100644 --- a/Telegram/SourceFiles/config.h.in +++ b/Telegram/SourceFiles/config.h.in @@ -24,15 +24,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #ifdef Q_OS_WIN # include #endif -#include "core/version.h" + #include "settings.h" #include "core/utils.h" -constexpr str_const AppName = "${KEPKA_APPNAME}"; - +constexpr str_const AppName = "@PROJECT_NAME@"; constexpr str_const AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used in updater.cpp and Setup.iss for Windows constexpr str_const AppFile = "Telegram"; +#define BETA_VERSION_MACRO (0ULL) +constexpr int AppVersion = (@PROJECT_VERSION_MAJOR@ * 1'000'000) + (@PROJECT_VERSION_MINOR@ * 1'000) + @PROJECT_VERSION_PATCH@; +constexpr str_const AppVersionStr = "@PROJECT_VERSION@"; +constexpr bool AppAlphaVersion = false; +constexpr quint64 AppBetaVersion = BETA_VERSION_MACRO; + enum { MTPShortBufferSize = 65535, // of ints, 256 kb MTPPacketSizeMax = 67108864, // 64 mb diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h deleted file mode 100644 index 2035ddc45..000000000 --- a/Telegram/SourceFiles/core/version.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop version of Telegram messaging app, see https://telegram.org - -Telegram Desktop is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -It is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -In addition, as a special exception, the copyright holders give permission -to link the code of portions of this program with the OpenSSL library. - -Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE -Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org -*/ -#pragma once - -#include "utils.h" -#include - -#define BETA_VERSION_MACRO (0ULL) - -constexpr int AppVersion = 1001023; -constexpr str_const AppVersionStr = "1.1.23-procxx"; -constexpr bool AppAlphaVersion = false; -constexpr quint64 AppBetaVersion = BETA_VERSION_MACRO;