[cpp-msbuild] branch master updated: CPPOST-94 Make OpenSAML tooling multi VC aware

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

The following commit(s) were added to refs/heads/master by this push:
       new  b1b3ee0   CPPOST-94 Make OpenSAML tooling multi VC aware
b1b3ee0 is described below

commit b1b3ee0daf3131f4a10002bc49d3837de41520cb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 29 17:10:31 2016 +0100

    CPPOST-94 Make OpenSAML tooling multi VC aware
    
    https://issues.shibboleth.net/jira/browse/CPPOST-94
    
    Both the output and the project files are moved from the top
    level directory.
---
 build.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.make b/build.make
index 8cc6af3..f0cfac7 100644
--- a/build.make
+++ b/build.make
@@ -18,7 +18,7 @@ clean:
 	del/s *.wixobj *.lib *.wixlib  *.pdb *.wixpdb *.wixlib  *.msi 
 	cd $(XMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
-	cd $(SAMLROOT)
+	cd $(SAMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
 
 
@@ -49,13 +49,13 @@ shibsp64: saml64
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 
 saml32: xmltooling32
-	cd $(SAMLROOT)
+	cd $(SAMLROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 
 
 saml64: xmltooling64
-	cd $(SAMLROOT)
+	cd $(SAMLROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.