Jamfile fixes for cygwin

This commit is contained in:
Arvid Norberg 2007-04-05 23:12:50 +00:00
parent b1501d0dac
commit 94fab39d4c
1 changed files with 12 additions and 10 deletions

22
Jamfile
View File

@ -97,8 +97,13 @@ LIBS = ;
if [ os.name ] = CYGWIN if [ os.name ] = CYGWIN
{ {
lib wsock32 : : <name>wsock32 ;
lib ws2_32 : : <name>ws2_32 ;
LIBS += wsock32 ws2_32 ;
DEFINES += WIN32_LEAN_AND_MEAN ;
DEFINES += _WIN32_WINNT=0x0500 ;
DEFINES += __USE_W32_SOCKETS ; DEFINES += __USE_W32_SOCKETS ;
DEFINES += _WIN32_WINNT ; DEFINES += WIN32 ;
} }
# some windows specific settings # some windows specific settings
@ -107,7 +112,9 @@ if [ os.name ] = NT
{ {
lib wsock32 : : <name>wsock32.lib ; lib wsock32 : : <name>wsock32.lib ;
LIBS += wsock32 ; LIBS += wsock32 ;
DEFINES += _WIN32_WINNT ; DEFINES += WIN32_LEAN_AND_MEAN ;
DEFINES += _WIN32_WINNT=0x0500 ;
DEFINES += WIN32 ;
} }
@ -128,13 +135,9 @@ project torrent
<library>/boost/filesystem//boost_filesystem #/<link>static <library>/boost/filesystem//boost_filesystem #/<link>static
<library>/boost/date_time//boost_date_time #/<link>static <library>/boost/date_time//boost_date_time #/<link>static
<threading>multi <threading>multi
<toolset>msvc:<define>_WIN32_WINNT=0x0500
# WIN32 makes sure the win32 socket api is used # ======= compiler settings =======
# instead of win16
<toolset>msvc:<define>WIN32
# without WIN32_LEAN_AND_MEAN there will be conflicts between
# winsock.h and winsock2.h
<toolset>msvc:<define>WIN32_LEAN_AND_MEAN
# these compiler settings just makes the compiler standard conforming # these compiler settings just makes the compiler standard conforming
<toolset>msvc:<cxxflags>/Zc:wchar_t <toolset>msvc:<cxxflags>/Zc:wchar_t
<toolset>msvc:<cxxflags>/Zc:forScope <toolset>msvc:<cxxflags>/Zc:forScope
@ -158,7 +161,6 @@ project torrent
<define>BOOST_ALL_NO_LIB <define>BOOST_ALL_NO_LIB
<define>$(DEFINES) <define>$(DEFINES)
<link>shared:<define>TORRENT_LINKING_SHARED <link>shared:<define>TORRENT_LINKING_SHARED
; ;
#cpp-pch pch : include/libtorrent/pch.hpp ; #cpp-pch pch : include/libtorrent/pch.hpp ;