procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2014-10-22 23:45:38 +04:00
parent 12ff311114 38f606b612
commit 4991b6743f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/mtproto/mtpCoreTypes.cpp
View File

@ -18,6 +18,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
#include "stdafx.h" #include "stdafx.h"
#include "mtpCoreTypes.h" #include "mtpCoreTypes.h"
#if defined _DEBUG || defined _WITH_DEBUG
QString mtpWrapNumber(float64 number) { QString mtpWrapNumber(float64 number) {
return QString::number(number); return QString::number(number);
} }
@ -180,3 +182,5 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
} break; } break;
} }
} }
#endif

4
Telegram/Telegram.pro
View File

@ -10,7 +10,7 @@ CONFIG(debug, debug|release) {
DESTDIR = ./../Debug DESTDIR = ./../Debug
} }
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
DEFINES += CUSTOM_API_ID DEFINES += _WITH_DEBUG CUSTOM_API_ID
OBJECTS_DIR = ./../ReleaseIntermediate OBJECTS_DIR = ./../ReleaseIntermediate
MOC_DIR = ./GenFiles/Release MOC_DIR = ./GenFiles/Release
RCC_DIR = ./GenFiles RCC_DIR = ./GenFiles
@ -104,9 +104,11 @@ SOURCES += \
./SourceFiles/window.cpp \ ./SourceFiles/window.cpp \
./SourceFiles/mtproto/mtp.cpp \ ./SourceFiles/mtproto/mtp.cpp \
./SourceFiles/mtproto/mtpConnection.cpp \ ./SourceFiles/mtproto/mtpConnection.cpp \
./SourceFiles/mtproto/mtpCoreTypes.cpp \
./SourceFiles/mtproto/mtpDC.cpp \ ./SourceFiles/mtproto/mtpDC.cpp \
./SourceFiles/mtproto/mtpFileLoader.cpp \ ./SourceFiles/mtproto/mtpFileLoader.cpp \
./SourceFiles/mtproto/mtpRPC.cpp \ ./SourceFiles/mtproto/mtpRPC.cpp \
./SourceFiles/mtproto/mtpScheme.cpp \
./SourceFiles/mtproto/mtpSession.cpp \ ./SourceFiles/mtproto/mtpSession.cpp \
./SourceFiles/gui/animation.cpp \ ./SourceFiles/gui/animation.cpp \
./SourceFiles/gui/boxshadow.cpp \ ./SourceFiles/gui/boxshadow.cpp \