summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIbrahim Esmat <iesmat@microsoft.com>2017-07-24 12:09:00 -0700
committerIbrahim Esmat <iesmat@microsoft.com>2017-07-24 12:09:00 -0700
commit06bd169b5c94a50f666bde846e4ce96d6fd1dd21 (patch)
treeb9062887c314026c0b8d0245cca25a9b862d6706
parentd1ae36a3ea678b764c0a0c014649e29a43ab2fa0 (diff)
downloadscons-06bd169b5c94a50f666bde846e4ce96d6fd1dd21.tar.gz
Change UWP_APP to be MSVC_UWP_APP
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py2
-rw-r--r--src/engine/SCons/Tool/msvc.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index c0a10436..41263147 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -439,7 +439,7 @@ def msvc_find_valid_batch_script(env,version):
maj, min = msvc_version_to_maj_min(version)
# VS2015+
if maj >= 14:
- if env.get('UWP_APP') == '1':
+ if env.get('MSVC_UWP_APP') == '1':
# Initialize environment variables with store/universal paths
arg += ' store'
diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml
index 18f4fb6a..1823a895 100644
--- a/src/engine/SCons/Tool/msvc.xml
+++ b/src/engine/SCons/Tool/msvc.xml
@@ -442,14 +442,14 @@ For example, if you want to compile 64-bit binaries, you would set
</summary>
</cvar>
-<cvar name="UWP_APP">
+<cvar name="MSVC_UWP_APP">
<summary>
<para>
Build libraries for a Universal Windows Platform (UWP) Application.
</para>
<para>
-If &cv-UWP_APP; is set, the Visual Studio environment will be set up to point
+If &cv-MSVC_UWP_APP; is set, the Visual Studio environment will be set up to point
to the Windows Store compatible libraries and Visual Studio runtimes. In doing so,
any libraries that are built will be able to be used in a UWP App and published
to the Windows Store.