https://bugzilla.tianocore.org/show_bug.cgi?id=2315
Add use of RC_PATH define that provides the path to the resource
compiler that is typically provided in a Windows SDK. The path
changes with different Windows SDK releases. This define is set
to the WINSDK_PATH_FOR_RC_EXE environment variable. This
environment variable must be set to the path to the currently
installed resource compiler (rc.exe).
Update set_vsprefix_envs.bat to set WINSDK_PATH_FOR_RC_EXE
if a Windows SDK is detected.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
# Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
# Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
# Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
# Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+# Copyright (c) Microsoft Corporation\r
#\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
#\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
+#\r
+# Increase this version tag any time you want user to get warning about updating this\r
+# file in the Conf dir. By default it does not do update existing conf dirs.\r
+#\r
+# 2.00 - Initial version with changes for CI\r
+# - Change RC path to use plugin\r
+#\r
+#!VERSION=2.00\r
\r
IDENTIFIER = Default TOOL_CHAIN_CONF\r
\r
\r
IDENTIFIER = Default TOOL_CHAIN_CONF\r
\r
DEFINE VS2019_BIN_ARM = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm\r
DEFINE VS2019_BIN_AARCH64 = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64\r
\r
DEFINE VS2019_BIN_ARM = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm\r
DEFINE VS2019_BIN_AARCH64 = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64\r
\r
+#\r
+# Resource compiler\r
+#\r
+DEFINE RC_PATH = ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe\r
+\r
DEFINE WINSDK_BIN = ENV(WINSDK_PREFIX)\r
DEFINE WINSDKx86_BIN = ENV(WINSDKx86_PREFIX)\r
\r
DEFINE WINSDK_BIN = ENV(WINSDK_PREFIX)\r
DEFINE WINSDKx86_BIN = ENV(WINSDKx86_PREFIX)\r
\r
\r
*_VS2017_*_MAKE_PATH = DEF(VS2017_BIN_HOST)\nmake.exe\r
*_VS2017_*_MAKE_FLAG = /nologo\r
\r
*_VS2017_*_MAKE_PATH = DEF(VS2017_BIN_HOST)\nmake.exe\r
*_VS2017_*_MAKE_FLAG = /nologo\r
-*_VS2017_*_RC_PATH = DEF(WINSDK10_BIN)\rc.exe\r
+*_VS2017_*_RC_PATH = DEF(RC_PATH)\r
\r
*_VS2017_*_MAKE_FLAGS = /nologo\r
*_VS2017_*_SLINK_FLAGS = /NOLOGO /LTCG\r
\r
*_VS2017_*_MAKE_FLAGS = /nologo\r
*_VS2017_*_SLINK_FLAGS = /NOLOGO /LTCG\r
\r
*_VS2019_*_MAKE_PATH = DEF(VS2019_BIN_HOST)\nmake.exe\r
*_VS2019_*_MAKE_FLAG = /nologo\r
\r
*_VS2019_*_MAKE_PATH = DEF(VS2019_BIN_HOST)\nmake.exe\r
*_VS2019_*_MAKE_FLAG = /nologo\r
-*_VS2019_*_RC_PATH = DEF(WINSDK10_BIN)\rc.exe\r
+*_VS2019_*_RC_PATH = DEF(RC_PATH)\r
\r
*_VS2019_*_MAKE_FLAGS = /nologo\r
*_VS2019_*_SLINK_FLAGS = /NOLOGO /LTCG\r
\r
*_VS2019_*_MAKE_FLAGS = /nologo\r
*_VS2019_*_SLINK_FLAGS = /NOLOGO /LTCG\r
+if not defined WINSDK_PATH_FOR_RC_EXE (\r
+ if defined WINSDK10_PREFIX (\r
+ set "WINSDK_PATH_FOR_RC_EXE=%WINSDK10_PREFIX%x86"\r
+ )\r
+)\r
\r
:SetVS2017\r
if not defined VS150COMNTOOLS (\r
\r
:SetVS2017\r
if not defined VS150COMNTOOLS (\r
+if not defined WINSDK_PATH_FOR_RC_EXE (\r
+ if defined WINSDK10_PREFIX (\r
+ set "WINSDK_PATH_FOR_RC_EXE=%WINSDK10_PREFIX%x86"\r
+ )\r
+)\r
\r
:SetWinDDK\r
if not defined WINDDK3790_PREFIX (\r
\r
:SetWinDDK\r
if not defined WINDDK3790_PREFIX (\r