Vlv2TbltDevicePkg: Allow BaseTools to run from sources

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 21f5b76e4b1c641755ff1ea26b62297f79a85246..890521434d60953b953b116d9540caa244fb5b0b 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,7 +3,8 @@
 @REM   however it may be executed directly from the BaseTools project folder\r
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.\r
 @REM\r
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM\r
 @REM This program and the accompanying materials are licensed and made available\r
 @REM under the terms and conditions of the BSD License which accompanies this \r
@@ -33,6 +34,9 @@ if /I "%1"=="/?" goto Usage
 :loop\r
   if "%1"=="" goto setup_workspace\r
   if /I "%1"=="--nt32" (\r
+    if /I "%2" == "X64" (\r
+      shift\r
+    )\r
     @REM Ignore --nt32 flag\r
     shift\r
     goto loop\r
@@ -160,6 +164,14 @@ if not defined WORKSPACE (
    goto skip_reconfig\r
 )\r
 \r
+IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (\r
+  @echo.\r
+  @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!!\r
+  @echo.\r
+  goto end\r
+)\r
+call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat\r
+\r
 if not defined CONF_PATH (\r
   set CONF_PATH=%WORKSPACE%\Conf\r
 )\r