BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / C / Makefiles / ms.common

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index 9e50b217fc86a1001f9c644ad513570fd00add50..75c9bb43a32ca920c5817801ca6a2612ad6394f4 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -2,13 +2,7 @@
 # Makefile\r
 #\r
 # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.    The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 !IFNDEF EDK_TOOLS_PATH\r
@@ -19,8 +13,8 @@
 !ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"\r
 !ENDIF\r
 \r
-!IFNDEF ARCH\r
-ARCH = IA32\r
+!IFNDEF HOST_ARCH\r
+HOST_ARCH = IA32\r
 !ENDIF\r
 \r
 MAKE        = nmake -nologo\r
@@ -36,20 +30,22 @@ LIB_PATH    = $(BASE_TOOLS_PATH)\Lib
 SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin\r
 SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib\r
 \r
-!IF "$(ARCH)"=="IA32"\r
+!IF "$(HOST_ARCH)"=="IA32"\r
 ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32\r
 BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32\r
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32\r
 SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32\r
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32\r
-!ENDIF\r
 \r
-!IF "$(ARCH)"=="X64"\r
+!ELSEIF "$(HOST_ARCH)"=="X64"\r
 ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64\r
 BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win64\r
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64\r
 SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64\r
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64\r
+\r
+!ELSE\r
+!ERROR "Bad HOST_ARCH"\r
 !ENDIF\r
 \r
 CC = cl.exe\r
@@ -61,6 +57,6 @@ LINKER = $(LD)
 \r
 INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)\r
 \r
-CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
+CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
 \r