Adjust Nt32 SecMain user-defined build file to use OBJECTS.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1268 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index 6144f521c9c93adec71ccd1d8a7d356877fc871e..cfadceffe242fdf1d88eb9cd58491b71cf93fe87 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -88,7 +88,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>\r
          </EXTRA.INC>\r
        </Build_AUTOGEN>\r
-       <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.obj" />\r
       <Build_CCode FILEEXT="c" FILENAME="FwVol" FILEPATH=".">\r
          <EXTRA.INC>\r
             <includepath path="${WORKSPACE_DIR}"/>\r
@@ -103,7 +102,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>\r
          </EXTRA.INC>\r
       </Build_CCode>\r
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/FwVol.obj" />\r
       <Build_CCode FILEEXT="c" FILENAME="WinNtThunk" FILEPATH=".">\r
          <EXTRA.INC>\r
             <includepath path="${WORKSPACE_DIR}"/>\r
@@ -118,7 +116,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>\r
          </EXTRA.INC>\r
       </Build_CCode>\r
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/WinNtThunk.obj" />\r
       <Build_CCode FILEEXT="c" FILENAME="SecMain" FILEPATH=".">\r
          <EXTRA.INC>\r
             <includepath path="${WORKSPACE_DIR}"/>\r
@@ -133,13 +130,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>\r
          </EXTRA.INC>\r
       </Build_CCode>\r
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/SecMain.obj" />\r
     </target>\r
+\r
     <target name="sections" />\r
+\r
     <target name="output" >\r
       <OnDependency>\r
         <sourcefiles>\r
-          <file list="${OBJECTS}"/>\r
+          <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />\r
           <file list="${LIBS}"/>\r
         </sourcefiles>\r
         <targetfiles>\r
@@ -147,27 +145,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
         \r
         <sequential>\r
+          <cc userdefine="on">\r
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"\r
+                outputFile="${DEST_DIR_OUTPUT}/SecMainLocal.lib">\r
+                \r
+              <argument value="${SLINK_FLAGS}"/>\r
+\r
+              <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>\r
+            </command>\r
+          </cc>\r
+          \r
+          <var name="LIBS" value="${LIBS} ${DEST_DIR_OUTPUT}/SecMainLocal.lib" />\r
+         \r
           <shellscript shell="cmd.exe" tmpsuffix=".cmd" >\r
             <arg line="/q"/>\r
             <arg line="/c"/>\r
             <arg line="call"/>\r
-            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb\r
+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb\r
           </shellscript>\r
         </sequential>\r
       </OnDependency>\r
-      <!--      \r
-      <cc userdefine="on">\r
-        <command type="LINK">\r
-          <argument value="/LIBPATH:&quot;${env.MSVCDir}\Lib&quot; /LIBPATH:&quot;${env.MSVCDir}\PlatformSdk\Lib&quot;" />\r
-          <argument value="/NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG" />\r
-          <argument value="Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib" />\r
-          <argument value="${OBJECTS}" />\r
-          <argument value="${LIBS}" />\r
-          <argument value="/base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb" />\r
-      </command>\r
-    </cc>\r
-    -->\r
   </target>\r
+  \r
   <target name="clean" ></target>\r
 \r
   <target name="cleanAll"></target>\r