summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BaseTools/Conf/tools_def.template32
1 files changed, 20 insertions, 12 deletions
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index a68218deac..864c8b9181 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -60,6 +60,14 @@ DEFINE WINSDK_VERSION = v6.0A
DEFINE WINSDK_BIN = c:\Program Files\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
DEFINE WINSDKx86_BIN = c:\Program Files (x86)\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
+# Microsoft Visual Studio 2010
+DEFINE WINSDK7_BIN = c:\Program Files\Microsoft SDKs\Windows\v7.0A\Bin
+DEFINE WINSDK7x86_BIN = c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin
+
+# Microsoft Visual Studio 2012 Update 1 (required for rc.exe that was not included in the initial release)
+DEFINE WINSDK71_BIN = c:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin
+DEFINE WINSDK71x86_BIN = c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin
+
# These defines are needed for certain Microsoft Visual Studio tools that
# are used by other toolchains. An example is that ICC on Windows normally
# uses Microsoft's nmake.exe.
@@ -255,7 +263,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
# http://www.acpica.org/downloads/previous_releases.php
# VS2012 -win32- Requires:
-# Microsoft Visual Studio 2012 Professional Edition
+# Microsoft Visual Studio 2012 Professional Edition Update 1
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
# Optional:
# Required to build EBC drivers:
@@ -393,7 +401,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
# VS2012xASL -win32- Requires:
-# Microsoft Visual Studio 2012 Professional Edition
+# Microsoft Visual Studio 2012 Professional Edition Update 1
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
# Optional:
# Required to build EBC drivers:
@@ -466,7 +474,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
# http://www.acpica.org/downloads/previous_releases.php
# VS2012x86 -win64- Requires:
-# Microsoft Visual Studio 2012 (x86) Professional Edition
+# Microsoft Visual Studio 2012 (x86) Professional Edition Update 1
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
# Optional:
# Required to build platforms or ACPI tables:
@@ -520,7 +528,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
# VS2012x86xASL -win64- Requires:
-# Microsoft Visual Studio 2012 (x86) Professional Edition
+# Microsoft Visual Studio 2012 (x86) Professional Edition Update 1
# Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830
# Optional:
# Required to build platforms or ACPI tables:
@@ -1895,7 +1903,7 @@ NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
*_VS2010_*_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
*_VS2010_*_MAKE_FLAGS = /nologo
-*_VS2010_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2010_*_RC_PATH = DEF(WINSDK7_BIN)\rc.exe
*_VS2010_*_SLINK_FLAGS = /NOLOGO /LTCG
*_VS2010_*_APP_FLAGS = /nologo /E /TC
@@ -2033,7 +2041,7 @@ NOOPT_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
*_VS2010xASL_*_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
*_VS2010xASL_*_MAKE_FLAG = /nologo
-*_VS2010xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2010xASL_*_RC_PATH = DEF(WINSDK7_BIN)\rc.exe
*_VS2010xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
*_VS2010xASL_*_APP_FLAGS = /nologo /E /TC
@@ -2168,7 +2176,7 @@ NOOPT_VS2010xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,
*_VS2010x86_*_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
*_VS2010x86_*_MAKE_FLAG = /nologo
-*_VS2010x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2010x86_*_RC_PATH = DEF(WINSDK7x86_BIN)\rc.exe
*_VS2010x86_*_MAKE_FLAGS = /nologo
*_VS2010x86_*_SLINK_FLAGS = /NOLOGO /LTCG
@@ -2303,7 +2311,7 @@ NOOPT_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I
*_VS2010x86xASL_*_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
*_VS2010x86xASL_*_MAKE_FLAG = /nologo
-*_VS2010x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2010x86xASL_*_RC_PATH = DEF(WINSDK7x86_BIN)\rc.exe
*_VS2010x86xASL_*_MAKE_FLAGS = /nologo
*_VS2010x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
@@ -2442,7 +2450,7 @@ NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
*_VS2012_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe
*_VS2012_*_MAKE_FLAGS = /nologo
-*_VS2012_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2012_*_RC_PATH = DEF(WINSDK7_BIN)\rc.exe
*_VS2012_*_SLINK_FLAGS = /NOLOGO /LTCG
*_VS2012_*_APP_FLAGS = /nologo /E /TC
@@ -2552,7 +2560,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
*_VS2012xASL_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe
*_VS2012xASL_*_MAKE_FLAG = /nologo
-*_VS2012xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2012xASL_*_RC_PATH = DEF(WINSDK7_BIN)\rc.exe
*_VS2012xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
*_VS2012xASL_*_APP_FLAGS = /nologo /E /TC
@@ -2659,7 +2667,7 @@ NOOPT_VS2012xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
*_VS2012x86_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe
*_VS2012x86_*_MAKE_FLAG = /nologo
-*_VS2012x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2012x86_*_RC_PATH = DEF(WINSDK7x86_BIN)\rc.exe
*_VS2012x86_*_MAKE_FLAGS = /nologo
*_VS2012x86_*_SLINK_FLAGS = /NOLOGO /LTCG
@@ -2766,7 +2774,7 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
*_VS2012x86xASL_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe
*_VS2012x86xASL_*_MAKE_FLAG = /nologo
-*_VS2012x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+*_VS2012x86xASL_*_RC_PATH = DEF(WINSDK7x86_BIN)\rc.exe
*_VS2012x86xASL_*_MAKE_FLAGS = /nologo
*_VS2012x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:11:15 +0000