Added icc toolset support for Linux/MacOS X
git-svn-id: http://pugixml.googlecode.com/svn/trunk@823 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
parent
696a0ea588
commit
5c02ac5645
55
Jamrules.jam
55
Jamrules.jam
@ -211,6 +211,8 @@ else if ( $(toolset:I=^msvc) )
|
|||||||
}
|
}
|
||||||
else if ( $(toolset:I=^ic) )
|
else if ( $(toolset:I=^ic) )
|
||||||
{
|
{
|
||||||
|
if ( $(OS) = NT )
|
||||||
|
{
|
||||||
if ( $(toolset) = ic8 || $(toolset) = ic9 )
|
if ( $(toolset) = ic8 || $(toolset) = ic9 )
|
||||||
{
|
{
|
||||||
msvc = "msvc71" ;
|
msvc = "msvc71" ;
|
||||||
@ -286,6 +288,59 @@ else if ( $(toolset:I=^ic) )
|
|||||||
{
|
{
|
||||||
"%$(msvc)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib$(postfix)" /LIBPATH:"%$(msvc)_PATH%\lib$(msvc_postfix)" /LIBPATH:"%$(msvc)_PATH%\PlatformSDK\lib$(msvc_postfix)" $(LDFLAGS)
|
"%$(msvc)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib$(postfix)" /LIBPATH:"%$(msvc)_PATH%\lib$(msvc_postfix)" /LIBPATH:"%$(msvc)_PATH%\PlatformSDK\lib$(msvc_postfix)" $(LDFLAGS)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rule GetCFlags CONFIG : DEFINES
|
||||||
|
{
|
||||||
|
local RESULT = -D$(DEFINES) ;
|
||||||
|
|
||||||
|
RESULT += -fp-model strict ;
|
||||||
|
|
||||||
|
RESULT += -Wall -Werror -Wcheck ;
|
||||||
|
RESULT += -Wformat -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wstrict-aliasing ;
|
||||||
|
RESULT += -Wstrict-prototypes -Wpointer-arith -Wuninitialized -Wdeprecated -Wabi ;
|
||||||
|
RESULT += -Wcast-qual -Wunused-function -Wunknown-pragmas -Wmain -Wcomment -Wconversion ;
|
||||||
|
RESULT += -Wreturn-type -Wextra-tokens -Wpragma-once -Wshadow -Woverloaded-virtual -Wtrigraphs ;
|
||||||
|
RESULT += -Wmultichar -Woverflow -Wwrite-strings -Wsign-compare -Wp64 -Wshorten-64-to-32 ;
|
||||||
|
|
||||||
|
if ( $(fulldebug) )
|
||||||
|
{
|
||||||
|
RESULT += -g ;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $(CONFIG) = "debug" )
|
||||||
|
{
|
||||||
|
RESULT += -D_DEBUG ;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RESULT += -DNDEBUG -O3 ;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) )
|
||||||
|
{
|
||||||
|
RESULT += -fno-exceptions ;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $(RESULT) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
actions ObjectAction
|
||||||
|
{
|
||||||
|
icc -c $(>) -o $(<) $(CCFLAGS)
|
||||||
|
}
|
||||||
|
|
||||||
|
actions LibraryAction
|
||||||
|
{
|
||||||
|
ar rcs $(<) $(>)
|
||||||
|
}
|
||||||
|
|
||||||
|
actions LinkAction
|
||||||
|
{
|
||||||
|
icc $(>) -o $(<) $(LDFLAGS)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if ( $(toolset:I=^dmc) )
|
else if ( $(toolset:I=^dmc) )
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user