Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Sample / Tools / Source / ProcessDsc / Makefile

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
index 417951cf59a0c9b2a3185750088ac02e1658392a..e2a4b5f06bc41257b3f06cad35538948061d3dfc 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
@@ -1,6 +1,6 @@
 #/*++\r
 #  \r
-#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2004 - 2010, 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
@@ -49,25 +49,31 @@ TARGET_EXE          = $(EDK_TOOLS_OUTPUT)\ProcessDsc.exe
 \r
 all: $(TARGET_EXE)\r
 \r
-INC_DEPS  = $(TARGET_SRC_DIR)\DSCFile.h    $(INC_DEPS)\r
-INC_DEPS  = $(TARGET_SRC_DIR)\FWVolume.h   $(INC_DEPS)\r
-INC_DEPS  = $(TARGET_SRC_DIR)\Exceptions.h $(INC_DEPS)\r
-INC_DEPS  = $(TARGET_SRC_DIR)\Common.h     $(INC_DEPS)\r
+INC_DEPS  = $(TARGET_SRC_DIR)\DSCFile.h     $(INC_DEPS)\r
+INC_DEPS  = $(TARGET_SRC_DIR)\MultiThread.h $(INC_DEPS)\r
+INC_DEPS  = $(TARGET_SRC_DIR)\FWVolume.h    $(INC_DEPS)\r
+INC_DEPS  = $(TARGET_SRC_DIR)\Exceptions.h  $(INC_DEPS)\r
+INC_DEPS  = $(TARGET_SRC_DIR)\Common.h      $(INC_DEPS)\r
 \r
 LIBS      = $(LIBS) "$(EDK_TOOLS_OUTPUT)\Common.lib"\r
 \r
-OBJECTS   = $(EDK_TOOLS_OUTPUT)\DSCFile.obj  \\r
-            $(EDK_TOOLS_OUTPUT)\FWVolume.obj   \\r
-            $(EDK_TOOLS_OUTPUT)\ProcessDsc.obj \\r
+OBJECTS   = $(EDK_TOOLS_OUTPUT)\DSCFile.obj     \\r
+            $(EDK_TOOLS_OUTPUT)\MultiThread.obj \\r
+            $(EDK_TOOLS_OUTPUT)\FWVolume.obj    \\r
+            $(EDK_TOOLS_OUTPUT)\ProcessDsc.obj  \\r
             $(EDK_TOOLS_OUTPUT)\Exceptions.obj\r
 \r
 #\r
 # Compile each source file\r
 #\r
+C_FLAGS   = $(C_FLAGS) /MT /wd4201\r
 \r
 $(EDK_TOOLS_OUTPUT)\DSCFile.obj : $(TARGET_SRC_DIR)\DSCFile.c $(INC_DEPS)\r
   $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\DSCFile.c /Fo$@\r
 \r
+$(EDK_TOOLS_OUTPUT)\MultiThread.obj : $(TARGET_SRC_DIR)\MultiThread.c $(INC_DEPS)\r
+  $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\MultiThread.c /Fo$@\r
+\r
 $(EDK_TOOLS_OUTPUT)\FWVolume.obj : $(TARGET_SRC_DIR)\FWVolume.c $(INC_DEPS)\r
   $(CC) $(C_FLAGS) $(TARGET_SRC_DIR)\FWVolume.c /Fo$@\r
 \r
@@ -88,7 +94,9 @@ $(TARGET_EXE): $(EFI_PLATFORM_BIN)\Tools\$(TARGET_NAME).exe
   copy $(EFI_PLATFORM_BIN)\Tools\$(TARGET_NAME).pdb $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).pdb /Y\r
 !ELSE\r
 $(TARGET_EXE) : $(OBJECTS) $(LIBS)\r
-  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS)\r
+  $(LINK) $(MSVS_LINK_LIBPATHS) $(L_FLAGS) $(LIBS) /out:$(TARGET_EXE) $(OBJECTS) shlwapi.lib \\r
+  /NODEFAULTLIB:libc.lib  /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcd.lib \\r
+  /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib\r
 !IF ("$(EFI_BINARY_BUILD)" == "YES")\r
   if not exist $(EFI_PLATFORM_BIN)\Tools mkdir $(EFI_PLATFORM_BIN)\Tools\r
   if exist $(TARGET_EXE) copy $(TARGET_EXE) $(EFI_PLATFORM_BIN)\tools\$(TARGET_NAME).exe /Y\r
@@ -100,5 +108,6 @@ $(TARGET_EXE) : $(OBJECTS) $(LIBS)
 clean:\r
   @if exist $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* del $(EDK_TOOLS_OUTPUT)\$(TARGET_NAME).* > NUL\r
   @if exist $(EDK_TOOLS_OUTPUT)\DscFile.* del $(EDK_TOOLS_OUTPUT)\DscFile.* > NUL\r
+  @if exist $(EDK_TOOLS_OUTPUT)\MultiThread.* del $(EDK_TOOLS_OUTPUT)\MultiThread.* > NUL\r
   @if exist $(EDK_TOOLS_OUTPUT)\Exceptions* del $(EDK_TOOLS_OUTPUT)\Exceptions.* > NUL\r
   @if exist $(EDK_TOOLS_OUTPUT)\FwVolume.* del $(EDK_TOOLS_OUTPUT)\FwVolume.* > NUL\r