diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-09 17:26:08 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-09 17:26:08 +0000 |
| commit | 78057035d24492e4d73e44fe00132feac13f1dd9 (patch) | |
| tree | 8acceff2a04f91f0befde64b5662c44acf1f457f | |
| parent | 427714178ec89e3a24933a305a4de6ab1089847c (diff) | |
Build system fixes (old-style debug format for MSVC, removed Wp64 for MSVC9/10)
git-svn-id: http://pugixml.googlecode.com/svn/trunk@396 99668b35-9821-0410-8761-19e4c4f06640
| -rw-r--r-- | Jamrules.jam | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index e89e08c..548c508 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -59,7 +59,7 @@ else if ( $(toolset:I=^msvc) ) if ( $(fulldebug) ) { - CCFLAGS += /Zi ; + CCFLAGS += /Z7 ; LDFLAGS += /DEBUG ; } @@ -72,9 +72,14 @@ else if ( $(toolset:I=^msvc) ) CCFLAGS += /DNDEBUG /Ox /MT ; } + if ( $(toolset) = msvc7 || $(toolset) = msvc71 || $(toolset) = msvc8 ) + { + CCFLAGS += /Wp64 ; # Wp64 is deprecated from msvc9 + } + if ( $(toolset) != msvc6 ) { - CCFLAGS += /Wp64 /W4 ; + CCFLAGS += /W4 ; } else { |