From 78057035d24492e4d73e44fe00132feac13f1dd9 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sun, 9 May 2010 17:26:08 +0000
Subject: 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
---
 Jamrules.jam | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Jamrules.jam')

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
 	{
-- 
cgit v1.2.3