premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #264 from aldenml/cross-build 

Fixed to make it more cross compile friendly
This commit is contained in:
Arvid Norberg 2015-11-13 23:28:55 -05:00
parent d84cffd7e1 611d0c1c6e
commit 647a96eb8a
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jamfile
View File

@ -94,6 +94,7 @@ rule linking ( properties * )
# exclude gcc from a regular windows build to make mingw
# link against the regular unix library name
if <target-os>windows in $(properties)
&& ! <toolset>gcc in $(properties)
{
result += <library>ssleay32
<library>libeay32
@ -105,13 +106,7 @@ rule linking ( properties * )
}
else
{
result += <library>crypto <library>ssl <library>z ;
}
if <target-os>linux in $(properties)
{
# linker library on linux, required when using openssl
result += <library>dl ;
result += <library>crypto <library>ssl ;
}
}
@ -175,12 +170,6 @@ rule linking ( properties * )
result += <library>libsocket <library>libnsl ;
}
# clock_gettime on linux requires librt
if <target-os>linux in $(properties)
{
result += <library>librt ;
}
if <iconv>on in $(properties)
{
result += <library>libiconv ;
@ -555,8 +544,8 @@ variant test_barebones : debug
# required for openssl on windows
lib ssleay32 : : <name>ssleay32 ;
lib libeay32 : : <name>libeay32 ;
lib advapi32 : : <name>Advapi32 ;
lib user32 : : <name>User32 ;
lib advapi32 : : <name>advapi32 ;
lib user32 : : <name>user32 ;
lib shell32 : : <name>shell32 ;
lib gdi32 : : <name>gdi32 ;
lib dbghelp : : <name>dbghelp ;

4
ed25519/src/seed.cpp
View File

@ -15,8 +15,8 @@ using namespace Windows::Security::Cryptography;
using namespace Windows::Storage::Streams;
using namespace Microsoft::WRL;
#elif defined _WIN32
#include <Windows.h>
#include <Wincrypt.h>
#include <windows.h>
#include <wincrypt.h>
#else
#include <stdio.h>
#endif

2
include/libtorrent/aux_/byteswap.hpp
View File

@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <boost/cstdint.hpp>
#ifdef TORRENT_WINDOWS
#include <Winsock2.h>
#include <winsock2.h>
#else
// posix header
// for ntohl and htonl

2
src/session.cpp
View File

@ -349,7 +349,7 @@ namespace libtorrent
void session::start(int flags, settings_pack const& pack, io_service* ios)
{
#if defined _MSC_VER && defined TORRENT_DEBUG
// workaround for microsofts
// workaround for microsoft's
// hardware exceptions that makes
// it hard to debug stuff
::_set_se_translator(straight_to_debugger);