Possible fix of travis build.

This commit is contained in:
John Preston 2018-06-06 15:16:21 +03:00
parent 16f3ca87f5
commit c85fd368fe
10 changed files with 27 additions and 4 deletions

View file

@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <zlib.h> #include <zlib.h>
extern "C" {
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -24,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/evp.h> #include <openssl/evp.h>
} // extern "C"
#ifdef Q_OS_WIN // use Lzma SDK for win #ifdef Q_OS_WIN // use Lzma SDK for win
#include <LzmaLib.h> #include <LzmaLib.h>
@ -34,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
using std::string; using std::string;
using std::wstring; using std::wstring;
using std::cout; using std::cout;

View file

@ -7,12 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "base/bytes.h"
extern "C" {
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include "base/bytes.h" } // extern "C"
namespace openssl { namespace openssl {

View file

@ -18,10 +18,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "settings/settings_widget.h" #include "settings/settings_widget.h"
extern "C" {
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/err.h> #include <openssl/err.h>
} // extern "C"
#ifdef Q_OS_WIN // use Lzma SDK for win #ifdef Q_OS_WIN // use Lzma SDK for win
#include <LzmaLib.h> #include <LzmaLib.h>

View file

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "application.h" #include "application.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
extern "C" {
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -19,8 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/rand.h> #include <openssl/rand.h>
extern "C" {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
} // extern "C" } // extern "C"

View file

@ -7,8 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "mtproto/auth_key.h" #include "mtproto/auth_key.h"
extern "C" {
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/modes.h> #include <openssl/modes.h>
} // extern "C"
namespace MTP { namespace MTP {

View file

@ -18,12 +18,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "base/openssl_help.h" #include "base/openssl_help.h"
#include "base/qthelp_url.h" #include "base/qthelp_url.h"
extern "C" {
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/rand.h> #include <openssl/rand.h>
} // extern "C"
namespace MTP { namespace MTP {
namespace internal { namespace internal {

View file

@ -10,7 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/bytes.h" #include "base/bytes.h"
#include "base/openssl_help.h" #include "base/openssl_help.h"
#include "base/qthelp_url.h" #include "base/qthelp_url.h"
extern "C" {
#include <openssl/aes.h> #include <openssl/aes.h>
} // extern "C"
namespace MTP { namespace MTP {
namespace internal { namespace internal {

View file

@ -8,10 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/rsa_public_key.h" #include "mtproto/rsa_public_key.h"
#include "base/openssl_help.h" #include "base/openssl_help.h"
extern "C" {
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/err.h> #include <openssl/err.h>
} // extern "C"
namespace MTP { namespace MTP {
namespace internal { namespace internal {

View file

@ -11,7 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/dc_options.h" #include "mtproto/dc_options.h"
#include "mtproto/auth_key.h" #include "mtproto/auth_key.h"
#include "base/openssl_help.h" #include "base/openssl_help.h"
extern "C" {
#include <openssl/aes.h> #include <openssl/aes.h>
} // extern "C"
namespace MTP { namespace MTP {
namespace { namespace {

View file

@ -30,7 +30,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_session.h" #include "data/data_session.h"
#include "history/history.h" #include "history/history.h"
extern "C" {
#include <openssl/evp.h> #include <openssl/evp.h>
} // extern "C"
namespace Local { namespace Local {
namespace { namespace {