External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed gcc version detection in build scripts, added BadaSDK support

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@840 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-03-06 06:13:58 +00:00
parent fdc03d39ab
commit f817d5bca4
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Jamrules.jam
View File

@ -1,11 +1,19 @@
# Rules for Jamfile.jam # Rules for Jamfile.jam
if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset:I=^android) )
{ {
if ( $(toolset:I=^gcc) ) if ( $(toolset:I=^gcc) )
{ {
GCCPATH = "" ; GCCPATH = "" ;
} }
else if ( $(toolset:I=^bada) )
{
GCCPATH = "%$(toolset)_PATH%\\Tools\\Toolchains\\ARM\\bin\\arm-bada-eabi-" ;
}
else if ( $(toolset:I=^android) )
{
GCCPATH = "%$(toolset)_PATH%\\bin\\arm-linux-androideabi-" ;
}
else else
{ {
GCCPATH = "%$(toolset)_PATH%\\bin\\" ; GCCPATH = "%$(toolset)_PATH%\\bin\\" ;
@ -15,7 +23,11 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
{ {
ARCH = "" ; ARCH = "" ;
if ( $(OS) = NT || $(OS) = FREEBSD ) if ( $(toolset:I=^bada) )
{
LDFLAGS += -lstdc++ -lsupc++-xnew -lc ;
}
else if ( $(OS) = NT || $(OS) = FREEBSD )
{ {
LDFLAGS += -static-libgcc -static ; LDFLAGS += -static-libgcc -static ;
} }
@ -34,19 +46,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
LDFLAGS += $(ARCH) ; LDFLAGS += $(ARCH) ;
} }
rule MatchVersion MAJOR : MINOR local VERSION = [ Shell "$(GCCPATH)gcc -dumpversion" ] ;
{
local REGEX = "(gcc|mingw)"$(MAJOR)"\\.?"$(MINOR) ;
if ( $(toolset:I=$(REGEX)) )
{
return 1 ;
}
else
{
return 0 ;
}
}
rule GetCFlags CONFIG : DEFINES rule GetCFlags CONFIG : DEFINES
{ {
@ -58,7 +58,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ; RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ;
# gcc 4.0 has some warning regressions # gcc 4.0 has some warning regressions
if ( [ MatchVersion 4 : 0 ] = 0 ) if ( $(VERSION:X=4\.0) )
{ {
RESULT += -Wold-style-cast ; # gives warnings for fpclassify() on gcc 4.0.1 RESULT += -Wold-style-cast ; # gives warnings for fpclassify() on gcc 4.0.1
RESULT += -Wswitch-default ; # gives false-positives for couple of switches on template argument on gcc 4.0.1 RESULT += -Wswitch-default ; # gives false-positives for couple of switches on template argument on gcc 4.0.1
@ -66,7 +66,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
} }
# these warnings are supported on newer GCC versions only # these warnings are supported on newer GCC versions only
if ( [ MatchVersion 4 : "[4-9]" ] = 1 ) if ( $(VERSION) >= "4.4.0" )
{ {
RESULT += -Wstrict-null-sentinel -Wlogical-op -Wmissing-declarations ; RESULT += -Wstrict-null-sentinel -Wlogical-op -Wmissing-declarations ;
} }
@ -716,7 +716,7 @@ if ( $(UNIX) )
} }
else else
{ {
if ( $(toolset:I=(^xbox360|^ps3|wince$)) ) if ( $(toolset:I=(^xbox360|^ps3|wince|^bada$)) )
{ {
actions RunAction actions RunAction
{ {