From d132a265db76824e1f4a741661ae640882f58225 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sun, 8 Nov 2009 09:12:43 +0000
Subject: tests: Added msvcN_x64 support

git-svn-id: http://pugixml.googlecode.com/svn/trunk@209 99668b35-9821-0410-8761-19e4c4f06640
---
 Jamrules.jam | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Jamrules.jam b/Jamrules.jam
index f72de45..d4109d3 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -74,19 +74,31 @@ else if ( $(toolset:I=^msvc) )
 		CCFLAGS += /D_HAS_EXCEPTIONS=0 ;
 	}
 
+	if ( $(toolset:I=x64$) )
+	{
+		postfix = "\\amd64" ;
+		sdk_postfix = "\\x64" ;
+		LDFLAGS += /MACHINE:X64 ;
+	}
+	else
+	{
+		postfix = "" ;
+		sdk_postfix = "" ;
+	}
+
 	actions ObjectAction
 	{
-		"%$(toolset)_PATH%\bin\cl.exe" /WX /I"%$(toolset)_PATH%\include" /c $(>) /Fo$(<) /nologo $(CCFLAGS)
+		"%$(toolset)_PATH%\bin$(postfix)\cl.exe" /WX /I"%$(toolset)_PATH%\include" /c $(>) /Fo$(<) /nologo $(CCFLAGS)
 	}
 	
 	actions LibraryAction
 	{
-		"%$(toolset)_PATH%\bin\lib.exe" /NOLOGO /OUT:$(<) $(>)
+		"%$(toolset)_PATH%\bin$(postfix)\lib.exe" /NOLOGO /OUT:$(<) $(>)
 	}
 	
 	actions LinkAction
 	{
-		"%$(toolset)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib" /LIBPATH:"%$(toolset)_PATH%\PlatformSDK\lib" $(LDFLAGS)
+		"%$(toolset)_PATH%\bin$(postfix)\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib$(postfix)" /LIBPATH:"%$(toolset)_PATH%\PlatformSDK\lib" /LIBPATH:"%WINSDK_PATH%\Lib$(sdk_postfix)" $(LDFLAGS)
 	}
 	
 	actions CoverageAction
-- 
cgit v1.2.3