fixed maximize button in ubuntu, prepared linux32 build
This commit is contained in:
John Preston
parent
c93e4e27fe
commit
dd4b0f033c
86
QTCREATOR.md
86
QTCREATOR.md
|
|
@ -1,10 +1,18 @@
|
|||
##Build instructions for Qt Creator 2.7 under Ubuntu 14.04
|
||||
##Build instructions for Qt Creator 3.1.2 under Ubuntu 14.04
|
||||
|
||||
###Prepare
|
||||
|
||||
* Install git by command **sudo apt-get install git** in Terminal
|
||||
* Install g++ by command **sudo apt-get install g++** in Terminal
|
||||
* Install Qt Creator from Ubuntu Software Center
|
||||
* Install Qt Creator from [**Downloads page**](https://qt-project.org/downloads)
|
||||
|
||||
For 32 bit Ubuntu you need to install g++ version 4.8 manually by such commands
|
||||
|
||||
* sudo add-apt-repository ppa:ubuntu-toolchain-r/test
|
||||
* sudo apt-get update
|
||||
* sudo apt-get install gcc-4.8 g++-4.8
|
||||
* sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
|
||||
* sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20
|
||||
|
||||
###Prepare folder
|
||||
|
||||
|
|
@ -20,63 +28,9 @@ or download in ZIP and extract to **/home/user/TBuild** rename **tdesktop-master
|
|||
|
||||
###Prepare libraries
|
||||
|
||||
####OpenSSL 1.0.1g
|
||||
Install dev libraries
|
||||
|
||||
http://www.openssl.org/source/ > Download [**openssl-1.0.1h.tar.gz**](http://www.openssl.org/source/openssl-1.0.1h.tar.gz) (4.3 Mb)
|
||||
|
||||
Extract openssl-1.0.1h.tar.gz to **/home/user/TBuild/Libraries**
|
||||
|
||||
#####Building library
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/openssl-1.0.1h** and there run
|
||||
|
||||
./config
|
||||
make
|
||||
sudo make install
|
||||
|
||||
####liblzma
|
||||
|
||||
http://tukaani.org/xz/ > Download [**xz-5.0.5.tar.gz**](http://tukaani.org/xz/xz-5.0.5.tar.gz)
|
||||
|
||||
Extract to **/home/user/TBuild/Libraries**
|
||||
|
||||
#####Building library
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/xz-5.0.5** and there run
|
||||
|
||||
./configure
|
||||
make
|
||||
sudo make install
|
||||
|
||||
####zlib 1.2.8
|
||||
|
||||
http://zlib.net/ > Download [**zlib source code, version 1.2.8, tar.gz format**](http://zlib.net/zlib-1.2.8.tar.gz)
|
||||
|
||||
Extract to **/home/user/TBuild/Libraries**
|
||||
|
||||
#####Building library
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/zlib-1.2.8** and there run
|
||||
|
||||
./configure
|
||||
make
|
||||
sudo make install
|
||||
|
||||
####libexif 0.6.20
|
||||
|
||||
Get sources from https://github.com/telegramdesktop/libexif-0.6.20, by git – in Terminal go to **/home/user/TBuild/Libraries** and run
|
||||
|
||||
git clone https://github.com/telegramdesktop/libexif-0.6.20.git
|
||||
|
||||
or download in ZIP and extract to **/home/user/TBuild/Libraries**, rename **libexif-0.6.20-master** to **libexif-0.6.20** to have **/home/user/TBuild/Libraries/libexif-0.6.20/configure** script
|
||||
|
||||
#####Building library
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/libexif-0.6.20** and there run
|
||||
|
||||
./configure
|
||||
make
|
||||
sudo make install
|
||||
sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev
|
||||
|
||||
####Qt 5.3.1, slightly patched
|
||||
|
||||
|
|
@ -90,13 +44,7 @@ Apply patch – copy (with overwrite!) everything from **/home/user/TBuild/tdesk
|
|||
|
||||
Install some packages for Qt (see **/home/user/TBuild/Libraries/QtStatic/qtbase/src/plugins/platforms/xcb/README**)
|
||||
|
||||
sudo apt-get install libxcb-image0-dev
|
||||
sudo apt-get install libxcb-keysyms1-dev
|
||||
sudo apt-get install libxcb-icccm4-dev
|
||||
sudo apt-get install libxcb-render-util0-dev
|
||||
sudo apt-get install libxcb-util0-dev
|
||||
sudo apt-get install libxrender-dev
|
||||
sudo apt-get install libpulse-dev
|
||||
sudo apt-get install libxcb1-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libpulse-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-randr0-dev libx11-xcb-dev
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/QtStatic** and there run
|
||||
|
||||
|
|
@ -107,12 +55,6 @@ In Terminal go to **/home/user/TBuild/Libraries/QtStatic** and there run
|
|||
|
||||
building (**make** command) will take really long time.
|
||||
|
||||
In Ubuntu under Parallels Desktop there was a problem with libGL, bad symlink **/usr/lib/x86_64-linux-gnu/mesa/libGL.so** to unexisting file, had to fix it manually like this
|
||||
|
||||
sudo ln -sf libGL.so.1 /usr/lib/x86_64-linux-gnu/mesa/libGL.so
|
||||
|
||||
because only **/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1** existed.
|
||||
|
||||
#####Building pulseaudio plugin
|
||||
|
||||
In Terminal go to **/home/user/TBuild/Libraries/QtStatic/qtmultimedia/src/plugins/pulseaudio** and run
|
||||
|
|
@ -130,4 +72,4 @@ In Terminal go to **/home/user/TBuild/Libraries/QtStatic/qtmultimedia/src/plugin
|
|||
* Open MetaLang.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateLang** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateLang** and build for Debug
|
||||
* Open Telegram.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediate** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediate** and build for Debug
|
||||
* Open Updater.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateUpdater** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateUpdater** and build for Debug
|
||||
* Release Telegram build will require removing **CUSTOM_API_ID** definition in Telegram.pro project and may require changing paths in **/home/user/TBuild/tdesktop/Telegram/FixMake.sh** for static library linking fix
|
||||
* Release Telegram build will require removing **CUSTOM_API_ID** definition in Telegram.pro project and may require changing paths in **/home/user/TBuild/tdesktop/Telegram/FixMake.sh** or **/home/user/TBuild/tdesktop/Telegram/FixMake32.sh** for static library linking fix
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@ sed -i 's/\-lxcb\-shm/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
|
|||
sed -i 's/\-lxcb\-randr/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-shape/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-image/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-util\.a/g' Makefile
|
||||
sed -i 's/\-llzma/\/usr\/local\/lib\/liblzma\.a/g' Makefile
|
||||
sed -i 's/\-llzma/\/usr\/lib\/x86_64\-linux\-gnu\/liblzma\.a/g' Makefile
|
||||
sed -i 's/\-lz/\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a/g' Makefile
|
||||
sed -i 's/\-lssl/\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a/g' Makefile
|
||||
sed -i 's/\-lcrypto/\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a/g' Makefile
|
||||
sed -i 's/\-lexif/\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a/g' Makefile
|
||||
sed -i 's/\-lglib\-2\.0/\/usr\/lib\/x86_64\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/libxcb\-render\-util\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-render/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-sync/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/libxcb\-keysyms\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-icccm/\/usr\/lib\/libxcb\-icccm\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-shm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-randr/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-shape/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
|
||||
sed -i 's/\-lxcb\-image/\/usr\/lib\/libxcb\-image\.a \/usr\/lib\/i386\-linux\-gnu\/libxcb\-util\.a/g' Makefile
|
||||
sed -i 's/\-llzma/\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a/g' Makefile
|
||||
sed -i 's/\-lz/\/usr\/lib\/i386\-linux\-gnu\/libz\.a/g' Makefile
|
||||
sed -i 's/\-lssl/\/usr\/lib\/i386\-linux\-gnu\/libssl\.a/g' Makefile
|
||||
sed -i 's/\-lcrypto/\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a/g' Makefile
|
||||
sed -i 's/\-lexif/\/usr\/lib\/i386\-linux\-gnu\/libexif\.a/g' Makefile
|
||||
sed -i 's/\-lglib\-2\.0/\/usr\/lib\/i386\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
|
||||
|
||||
|
|
@ -23,10 +23,20 @@ SOURCES += \
|
|||
HEADERS += \
|
||||
./SourceFiles/_other/packer.h \
|
||||
|
||||
unix {
|
||||
linux-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
|
||||
linux-g++-32:QMAKE_TARGET.arch = x86
|
||||
linux-g++-64:QMAKE_TARGET.arch = x86_64
|
||||
|
||||
contains(QMAKE_TARGET.arch, x86_64) {
|
||||
DEFINES += Q_OS_LINUX64
|
||||
} else {
|
||||
DEFINES += Q_OS_LINUX32
|
||||
}
|
||||
}
|
||||
|
||||
INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
|
||||
./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
|
||||
./../../Libraries/QtStatic/qtbase/include\
|
||||
./../../Libraries/lzma/C\
|
||||
/usr/local/ssl/include
|
||||
./../../Libraries/QtStatic/qtbase/include
|
||||
|
||||
LIBS += -L/usr/local/ssl/lib -lcrypto -lssl -lz -llzma
|
||||
LIBS += -lcrypto -lssl -lz -llzma
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram"
|
|||
mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/
|
||||
mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/
|
||||
mv ./../Linux/Release/tlinuxupd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/
|
||||
cd ./../Linux/Release/deploy/$AppVersionStr && tar -czvf tsetup.$AppVersionStr.tar.gz Telegram/ && cd ./../../../../Telegram
|
||||
cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram
|
||||
echo "Version $AppVersionStr prepared!";
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
AppVersionStr=0.5.8
|
||||
AppVersion=5008
|
||||
|
||||
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
|
||||
echo "Deploy folder for version $AppVersionStr already exists!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f "./../Linux/Release/tlinux32upd$AppVersion" ]; then
|
||||
echo "Update file for version $AppVersion already exists!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "./../Linux/Release/Telegram" ]; then
|
||||
echo "Telegram not found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "./../Linux/Release/Updater" ]; then
|
||||
echo "Updater not found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Preparing version $AppVersionStr, executing Packer.."
|
||||
cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion && cd ./../../Telegram
|
||||
echo "Packer done!"
|
||||
|
||||
if [ ! -d "./../Linux/Release/deploy" ]; then
|
||||
mkdir "./../Linux/Release/deploy"
|
||||
fi
|
||||
echo "Copying Telegram, Updater and tlinux32upd$AppVersion to deploy/$AppVersionStr..";
|
||||
mkdir "./../Linux/Release/deploy/$AppVersionStr"
|
||||
mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram"
|
||||
mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/
|
||||
mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/
|
||||
mv ./../Linux/Release/tlinux32upd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/
|
||||
cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup32.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram
|
||||
echo "Version $AppVersionStr prepared!";
|
||||
|
||||
|
|
@ -90,6 +90,7 @@ ReplaceMap replaceMap;
|
|||
|
||||
static const int variantsCount = 4, variants[] = { 0, 2, 3, 4 }, inRow = 40, imSizes[] = { 16, 20, 24, 32 };
|
||||
static const char *variantPostfix[] = { "", "_125x", "_150x", "_200x" };
|
||||
static const char *shortNames[] = { "One", "OneAndQuarter", "OneAndHalf", "Two" };
|
||||
static const char *variantNames[] = { "dbisOne", "dbisOneAndQuarter", "dbisOneAndHalf", "dbisTwo" };
|
||||
|
||||
typedef QMap<uint32, EmojiData> EmojisData;
|
||||
|
|
@ -1092,7 +1093,7 @@ bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_p
|
|||
}
|
||||
}
|
||||
}
|
||||
if (needResave) {
|
||||
if (needResave) {
|
||||
QFile ef(emojif);
|
||||
if (!ef.open(QIODevice::WriteOnly)) {
|
||||
cout << "Could not save 'emoji" << postfix.toUtf8().constData() << ".png'!\n";
|
||||
|
|
@ -1140,20 +1141,24 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
|
|||
tcpp << "\tchar emojisData[sizeof(EmojiData) * " << emojisData.size() << "];\n";
|
||||
tcpp << "}\n\n";
|
||||
|
||||
for (int variantIndex = 0; variantIndex < variantsCount; ++variantIndex) {
|
||||
int imSize = imSizes[variantIndex];
|
||||
tcpp << "void initEmoji" << shortNames[variantIndex] << "() {\n";
|
||||
tcpp << "\tEmojiData *toFill = emojis = (EmojiData*)emojisData;\n\n";
|
||||
for (EmojisData::const_iterator i = emojisData.cbegin(), e = emojisData.cend(); i != e; ++i) {
|
||||
int len = i->code2 ? 4 : ((i->code >> 16) ? 2 : 1);
|
||||
tcpp << "\tnew (toFill++) EmojiData(" << (i->x * imSize) << ", " << (i->y * imSize) << ", " << i->code << "U, " << i->code2 << "U, " << len << ");\n";
|
||||
}
|
||||
tcpp << "}\n\n";
|
||||
}
|
||||
|
||||
tcpp << "void initEmoji() {\n";
|
||||
tcpp << "\tEmojiData *toFill = emojis = (EmojiData*)emojisData;\n\n";
|
||||
tcpp << "\tDBIScale emojiForScale = cRetina() ? dbisTwo : cScale();\n\n";
|
||||
tcpp << "\tswitch (emojiForScale) {\n\n";
|
||||
for (int variantIndex = 0; variantIndex < variantsCount; ++variantIndex) {
|
||||
int imSize = imSizes[variantIndex];
|
||||
tcpp << "\tcase " << variantNames[variantIndex] << ":\n";
|
||||
for (EmojisData::const_iterator i = emojisData.cbegin(), e = emojisData.cend(); i != e; ++i) {
|
||||
int len = i->code2 ? 4 : ((i->code >> 16) ? 2 : 1);
|
||||
tcpp << "\t\tnew (toFill++) EmojiData(" << (i->x * imSize) << ", " << (i->y * imSize) << ", " << i->code << ", " << i->code2 << ", " << len << ");\n";
|
||||
}
|
||||
tcpp << "\tbreak;\n\n";
|
||||
}
|
||||
tcpp << "\t};\n";
|
||||
tcpp << "\tswitch (emojiForScale) {\n";
|
||||
for (int variantIndex = 0; variantIndex < variantsCount; ++variantIndex) {
|
||||
tcpp << "\t\tcase " << variantNames[variantIndex] << ": initEmoji" << shortNames[variantIndex] << "(); break;\n";
|
||||
}
|
||||
tcpp << "\t};\n";
|
||||
tcpp << "};\n\n";
|
||||
|
||||
tcpp << "const EmojiData *getEmoji(uint32 code) {\n"; // getter
|
||||
|
|
@ -1169,37 +1174,37 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
|
|||
if (i->code2) break;
|
||||
if (i->code != 169 && i->code != 174) break;
|
||||
|
||||
tcpp << "\t\t\tcase " << i->code << ": return &emojis[" << (index++) << "];\n";
|
||||
tcpp << "\t\t\tcase " << i->code << "U: return &emojis[" << (index++) << "];\n";
|
||||
}
|
||||
tcpp << "\t\t}\n\n";
|
||||
tcpp << "\t\tif (code < " << min1 << " || code > " << max1 << ") return 0;\n\n";
|
||||
tcpp << "\t\tif (code < " << min1 << "U || code > " << max1 << "U) return 0;\n\n";
|
||||
tcpp << "\t\tswitch (code) {\n";
|
||||
for (; i != e; ++i) {
|
||||
if (i->code2 || (i->code >> 16)) break;
|
||||
tcpp << "\t\t\tcase " << i->code << ": return &emojis[" << (index++) << "];\n";
|
||||
tcpp << "\t\t\tcase " << i->code << "U: return &emojis[" << (index++) << "];\n";
|
||||
}
|
||||
tcpp << "\t\t}\n\n";
|
||||
tcpp << "\t\treturn 0;\n";
|
||||
tcpp << "\t}\n\n";
|
||||
|
||||
tcpp << "\tif (highCode == 35 || (highCode >= 48 && highCode < 58)) {\n"; // digits
|
||||
tcpp << "\t\tif ((code & 0xFFFF) != 0x20E3) return 0;\n\n";
|
||||
tcpp << "\t\tif ((code & 0xFFFF) != 0x20E3) return 0;\n\n";
|
||||
tcpp << "\t\tswitch (code) {\n";
|
||||
for (; i != e; ++i) {
|
||||
if (i->code2) break;
|
||||
uint32 high = i->code >> 16;
|
||||
if (high != 35 && (high < 48 || high >= 58)) break;
|
||||
|
||||
tcpp << "\t\t\tcase " << i->code << ": return &emojis[" << (index++) << "];\n";
|
||||
tcpp << "\t\t\tcase " << i->code << "U: return &emojis[" << (index++) << "];\n";
|
||||
}
|
||||
tcpp << "\t\t}\n\n";
|
||||
tcpp << "\t\treturn 0;\n";
|
||||
tcpp << "\t}\n\n";
|
||||
|
||||
tcpp << "\tif (code < " << min2 << " || code > " << max2 << ") return 0;\n\n";
|
||||
tcpp << "\tif (code < " << min2 << "U || code > " << max2 << "U) return 0;\n\n";
|
||||
tcpp << "\tswitch (code) {\n";
|
||||
for (; i != e; ++i) {
|
||||
tcpp << "\tcase " << i->code << ": return &emojis[" << (index++) << "];\n";
|
||||
tcpp << "\tcase " << i->code << "U: return &emojis[" << (index++) << "];\n";
|
||||
}
|
||||
tcpp << "\t}\n\n";
|
||||
|
||||
|
|
@ -1241,7 +1246,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
|
|||
}
|
||||
tcpp << tab.repeated(1 + chars.size()) << "newEmojiEnd = ch + " << chars.size() << ";\n";
|
||||
tcpp << tab.repeated(1 + chars.size()) << "if (newEmojiEnd == e || emojiEdge(newEmojiEnd) || newEmojiEnd->unicode() == ' ') {\n";
|
||||
tcpp << tab.repeated(1 + chars.size()) << "\temojiCode = " << i.value() << ";\n";
|
||||
tcpp << tab.repeated(1 + chars.size()) << "\temojiCode = " << i.value() << "U;\n";
|
||||
tcpp << tab.repeated(1 + chars.size()) << "\treturn;\n";
|
||||
tcpp << tab.repeated(1 + chars.size()) << "}\n";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -423,14 +423,14 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
cout << "Signature verified!\n";
|
||||
RSA_free(pbKey);
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
QString outName(QString("tupdate%1").arg(version));
|
||||
#elif defined Q_OS_MAC
|
||||
QString outName(QString("tmacupd%1").arg(version));
|
||||
#elif defined Q_OS_LINUX
|
||||
QString outName(QString("tlinuxupd%1").arg(version));
|
||||
#else
|
||||
#elif defined Q_OS_LINUX32
|
||||
QString outName(QString("tlinux32upd%1").arg(version));
|
||||
#elif defined Q_OS_LINUX64
|
||||
QString outName(QString("tlinuxupd%1").arg(version));
|
||||
#error Unknown platform!
|
||||
#endif
|
||||
QFile out(outName);
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ void Application::updateGotCurrent() {
|
|||
if (updates.exists()) {
|
||||
QFileInfoList list = updates.entryInfoList(QDir::Files);
|
||||
for (QFileInfoList::iterator i = list.begin(), e = list.end(); i != e; ++i) {
|
||||
if (QRegularExpression("^(tupdate|tmacupd|tlinuxupd)\\d+$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) {
|
||||
if (QRegularExpression("^(tupdate|tmacupd|tlinuxupd|tlinux32upd)\\d+$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) {
|
||||
QFile(i->absoluteFilePath()).remove();
|
||||
}
|
||||
}
|
||||
|
|
@ -412,7 +412,7 @@ void Application::startUpdateCheck(bool forceWait) {
|
|||
if (updates.exists()) {
|
||||
QFileInfoList list = updates.entryInfoList(QDir::Files);
|
||||
for (QFileInfoList::iterator i = list.begin(), e = list.end(); i != e; ++i) {
|
||||
if (QRegularExpression("^(tupdate|tmacupd|tlinuxupd)\\d+$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) {
|
||||
if (QRegularExpression("^(tupdate|tmacupd|tlinuxupd|tlinux32upd)\\d+$", QRegularExpression::CaseInsensitiveOption).match(i->fileName()).hasMatch()) {
|
||||
sendRequest = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -81,8 +81,11 @@ QUrl gUpdateURL = QUrl(qsl("http://tdesktop.com/win/tupdates/current"));
|
|||
#elif defined Q_OS_MAC
|
||||
DBIPlatform gPlatform = dbipMac;
|
||||
QUrl gUpdateURL = QUrl(qsl("http://tdesktop.com/mac/tupdates/current"));
|
||||
#elif defined Q_OS_LINUX
|
||||
DBIPlatform gPlatform = dbipLinux;
|
||||
#elif defined Q_OS_LINUX32
|
||||
DBIPlatform gPlatform = dbipLinux32;
|
||||
QUrl gUpdateURL = QUrl(qsl("http://tdesktop.com/linux32/tupdates/current"));
|
||||
#elif defined Q_OS_LINUX64
|
||||
DBIPlatform gPlatform = dbipLinux64;
|
||||
QUrl gUpdateURL = QUrl(qsl("http://tdesktop.com/linux/tupdates/current"));
|
||||
#else
|
||||
#error Unknown platform
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ void TitleWidget::maximizedChanged(bool maximized) {
|
|||
|
||||
lastMaximized = maximized;
|
||||
|
||||
if (cPlatform() == dbipMac) return;
|
||||
if (cPlatform() != dbipWindows) return;
|
||||
if (maximized) {
|
||||
_maximize.clearState();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -272,7 +272,8 @@ enum DBIEmojiTab {
|
|||
enum DBIPlatform {
|
||||
dbipWindows = 0,
|
||||
dbipMac = 1,
|
||||
dbipLinux = 2,
|
||||
dbipLinux64 = 2,
|
||||
dbipLinux32 = 3,
|
||||
};
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,19 @@ QMAKE_EXTRA_TARGETS += style_auto_cpp style_auto_h style_classes_h lang_cpp lang
|
|||
|
||||
PRE_TARGETDEPS += ./GeneratedFiles/style_auto.cpp ./GeneratedFiles/style_auto.h ./GeneratedFiles/style_classes.h ./GeneratedFiles/lang.h ./GeneratedFiles/lang.cpp
|
||||
|
||||
CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake.sh
|
||||
unix {
|
||||
linux-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
|
||||
linux-g++-32:QMAKE_TARGET.arch = x86
|
||||
linux-g++-64:QMAKE_TARGET.arch = x86_64
|
||||
|
||||
contains(QMAKE_TARGET.arch, x86_64) {
|
||||
CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake.sh
|
||||
DEFINES += Q_OS_LINUX64
|
||||
} else {
|
||||
CONFIG(release,debug|release):QMAKE_PRE_LINK = ./../../Telegram/FixMake32.sh
|
||||
DEFINES += Q_OS_LINUX32
|
||||
}
|
||||
}
|
||||
|
||||
SOURCES += \
|
||||
./SourceFiles/main.cpp \
|
||||
|
|
@ -238,12 +250,8 @@ INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
|
|||
./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
|
||||
./../../Libraries/QtStatic/qtbase/include\
|
||||
./SourceFiles\
|
||||
./GeneratedFiles\
|
||||
./../../Telegram/GeneratedFiles\ # qmake bug?.. Sometimes ./GeneratedFiles does not mean this path :(
|
||||
./../../Libraries/libexif-0.6.20\
|
||||
/usr/local/ssl/include
|
||||
LIBS += -L/usr/local/ssl/lib -lcrypto -lssl -lz -ldl -llzma -lpulse
|
||||
LIBS += ./../../../Libraries/libexif-0.6.20/libexif/.libs/libexif.a
|
||||
./GeneratedFiles
|
||||
LIBS += -lcrypto -lssl -lz -ldl -llzma -lpulse -lexif
|
||||
LIBS += ./../../../Libraries/QtStatic/qtmultimedia/plugins/audio/libqtmedia_pulse.a
|
||||
RESOURCES += \
|
||||
./SourceFiles/telegram_linux.qrc
|
||||
|
|
|
|||
Loading…
Reference in New Issue