CodeModule: BaseTools - tools_def.txt VS2010, VS2010x86, VS2012 and VS2012x86 update locations for rc.exe tool
This change will point to the correct location of the rc.exe tool. RC.exe is used for building UEFI compliant drivers that must have a UEFI_HII_RESOURCE_SECTION generated as part of the .efi image file. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lhauch <larry.ha...@intel.com> Reviewed-by: Gao, Liming <liming....@intel.com> Reviewed-by: Yingke Liu <yingke.d....@intel.com> Index: tools_def.template =================================================================== --- tools_def.template (revision 15651) +++ tools_def.template (working copy) @@ -60,6 +60,14 @@ 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. @@ -254,7 +262,7 @@ # 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: @@ -392,7 +400,7 @@ # 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: @@ -465,7 +473,7 @@ # 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: @@ -519,7 +527,7 @@ # 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: @@ -1894,7 +1902,7 @@ *_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 @@ -2032,7 +2040,7 @@ *_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 @@ -2167,7 +2175,7 @@ *_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 @@ -2302,7 +2310,7 @@ *_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 @@ -2441,7 +2449,7 @@ *_VS2012_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe *_VS2012_*_MAKE_FLAGS = /nologo -*_VS2012_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe +*_VS2012_*_RC_PATH = DEF(WINSDK71_BIN)\rc.exe *_VS2012_*_SLINK_FLAGS = /NOLOGO /LTCG *_VS2012_*_APP_FLAGS = /nologo /E /TC @@ -2551,7 +2559,7 @@ *_VS2012xASL_*_MAKE_PATH = DEF(VS2012_BIN)\nmake.exe *_VS2012xASL_*_MAKE_FLAG = /nologo -*_VS2012xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe +*_VS2012xASL_*_RC_PATH = DEF(WINSDK71_BIN)\rc.exe *_VS2012xASL_*_SLINK_FLAGS = /NOLOGO /LTCG *_VS2012xASL_*_APP_FLAGS = /nologo /E /TC @@ -2658,7 +2666,7 @@ *_VS2012x86_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe *_VS2012x86_*_MAKE_FLAG = /nologo -*_VS2012x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe +*_VS2012x86_*_RC_PATH = DEF(WINSDK71x86_BIN)\rc.exe *_VS2012x86_*_MAKE_FLAGS = /nologo *_VS2012x86_*_SLINK_FLAGS = /NOLOGO /LTCG @@ -2765,7 +2773,7 @@ *_VS2012x86xASL_*_MAKE_PATH = DEF(VS2012x86_BIN)\nmake.exe *_VS2012x86xASL_*_MAKE_FLAG = /nologo -*_VS2012x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe +*_VS2012x86xASL_*_RC_PATH = DEF(WINSDK71x86_BIN)\rc.exe *_VS2012x86xASL_*_MAKE_FLAGS = /nologo *_VS2012x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
