Sync BaseTool trunk (version r2649) into EDKII BaseTools.

[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 d2fbc453eebe238e51843df2202efd0511d7d20a..fa9ffba563a95fe60dfb2e9ff85dc6de99f35547 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -7,54 +7,54 @@
 # 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.
-
-!IFNDEF EDK_TOOLS_PATH
-!ERROR "Please set your EDK_TOOLS_PATH!"
-!ENDIF
-
-!IFNDEF BASE_TOOLS_PATH
-!ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"
-!ENDIF
-
-!IFNDEF ARCH
-ARCH = IA32
-!ENDIF
-
-MAKE        = nmake -nologo
-
-SOURCE_PATH = $(BASE_TOOLS_PATH)\Source\C
-BIN_PATH    = $(BASE_TOOLS_PATH)\Bin
-LIB_PATH    = $(BASE_TOOLS_PATH)\Lib
-
-SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin
-SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib
-
-!IF "$(ARCH)"=="IA32"
-ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32
-BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32
-LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32
-SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
-SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
-!ENDIF
-
-!IF "$(ARCH)"=="X64"
-ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64
-BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win64
-LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64
-SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64
-SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64
-!ENDIF
-
-CC = cl.exe
-CXX = cl.exe
-AS = ml.exe
-AR = lib.exe
-LD = link.exe
-LINKER = $(LD)
-
-INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)
-
-CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
-
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+!IFNDEF EDK_TOOLS_PATH\r
+!ERROR "Please set your EDK_TOOLS_PATH!"\r
+!ENDIF\r
+\r
+!IFNDEF BASE_TOOLS_PATH\r
+!ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"\r
+!ENDIF\r
+\r
+!IFNDEF ARCH\r
+ARCH = IA32\r
+!ENDIF\r
+\r
+MAKE        = nmake -nologo\r
+\r
+SOURCE_PATH = $(BASE_TOOLS_PATH)\Source\C\r
+BIN_PATH    = $(BASE_TOOLS_PATH)\Bin\r
+LIB_PATH    = $(BASE_TOOLS_PATH)\Lib\r
+\r
+SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin\r
+SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib\r
+\r
+!IF "$(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
+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
+!ENDIF\r
+\r
+CC = cl.exe\r
+CXX = cl.exe\r
+AS = ml.exe\r
+AR = lib.exe\r
+LD = link.exe\r
+LINKER = $(LD)\r
+\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
+\r