From 0ebd41e33ea5a2c5e69d7b474850cc2af9992afe Mon Sep 17 00:00:00 2001 From: Steve Gates Date: Fri, 11 Jul 2014 01:25:26 -0700 Subject: [PATCH] Fixing build break with Visual Studio if phone scripts aren't installed with VS 2012 or 2013. --- src/tools/msvc.jam | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam index 36dc1b23b..be1c97dec 100644 --- a/src/tools/msvc.jam +++ b/src/tools/msvc.jam @@ -1054,12 +1054,11 @@ local rule configure-really ( version ? : options * ) { phone-directory = [ path.native [ path.join $(phone-parent) WP81 ] ] ; } + global-setup-phone ?= [ locate-default-setup $(phone-directory) : $(phone-parent) : vcvarsphoneall.bat ] ; - # If phone-directory is not set then this VS version doesn't support Windows Phone. - if $(phone-directory)-is-defined + # If can't locate default phone setup script then this VS version doesn't support Windows Phone. + if $(global-setup-phone)-is-defined { - global-setup-phone ?= [ locate-default-setup $(phone-directory) : $(phone-parent) : vcvarsphoneall.bat ] ; - # i386 CPU is for the Windows Phone emulator in Visual Studio. local phone-cpu = i386 arm ; for local c in $(phone-cpu)