X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FSec%2FSecMain_build.xml;h=fc26a10779233a1e7a5e1d686600ac04d9949c3b;hp=f31886978545ccd719fc480664bc3e5b79409c12;hb=ed09422e6b32d60f0591c1dcd41146472585378d;hpb=2d52720093851dcc3f0ffd30ac9854cc775300a9

diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index f318869785..fc26a10779 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -56,14 +56,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
       <property name="PACKAGE_VERSION" value=""/>
     </GenBuild>
-    <GenBuild type="build">
-      <property name="ARCH" value="${ARCH}"/>
-      <property name="MODULE_GUID" value="55c61087-7367-4546-bc32-4937c5e6aff3"/>
-      <property name="MODULE_VERSION" value=""/>
-      <property name="PLATFORM" value="${PLATFORM}"/>
-      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-      <property name="PACKAGE_VERSION" value=""/>
-    </GenBuild>
     <GenBuild type="build">
       <property name="ARCH" value="${ARCH}"/>
       <property name="MODULE_GUID" value="9ba1d976-0624-41a3-8650-28165e8d9ae8"/>
@@ -74,72 +66,45 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </GenBuild>
   </target>
   <target name="sourcefiles">
+      <Build_Init>
+        <EXTRA.INC>
+          <includepath path="${INCLUDE_PATHS}"/>
+        </EXTRA.INC>
+      </Build_Init>
       <Build_AUTOGEN FILEEXT="c" FILENAME="AutoGen" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
        </Build_AUTOGEN>
-       <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.obj" />
       <Build_CCode FILEEXT="c" FILENAME="FwVol" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
       </Build_CCode>
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/FwVol.obj" />
       <Build_CCode FILEEXT="c" FILENAME="WinNtThunk" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
       </Build_CCode>
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/WinNtThunk.obj" />
       <Build_CCode FILEEXT="c" FILENAME="SecMain" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}"/>
-            <includepath path="${MODULE_DIR}"/>
-            <includepath path="${MODULE_DIR}\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
       </Build_CCode>
-      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/SecMain.obj" />
     </target>
+
     <target name="sections" />
+
     <target name="output" >
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        <then>
+          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        </then>
+      </if>
       <OnDependency>
         <sourcefiles>
-          <file list="${OBJECTS}"/>
+          <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
           <file list="${LIBS}"/>
         </sourcefiles>
         <targetfiles>
@@ -147,26 +112,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
         
         <sequential>
+          <cc userdefine="on">
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/SecMainLocal.lib" dpath="${SLINK_DPATH}">
+                
+              <argument value="${SLINK_FLAGS}"/>
+
+              <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
+            </command>
+          </cc>
+
+          <var name="LIBS" value="${LIBS} ${DEST_DIR_OUTPUT}/SecMainLocal.lib" />
+         
           <shellscript shell="cmd.exe" tmpsuffix=".cmd" >
+            <arg line="/q"/>
             <arg line="/c"/>
             <arg line="call"/>
-            "${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 MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
+            PATH ${DLINK_DPATH};%path%
+            "${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
           </shellscript>
         </sequential>
       </OnDependency>
-      <!--      
-      <cc userdefine="on">
-        <command type="LINK">
-          <argument value="/LIBPATH:&quot;${env.MSVCDir}\Lib&quot; /LIBPATH:&quot;${env.MSVCDir}\PlatformSdk\Lib&quot;" />
-          <argument value="/NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG" />
-          <argument value="Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib" />
-          <argument value="${OBJECTS}" />
-          <argument value="${LIBS}" />
-          <argument value="/base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb" />
-      </command>
-    </cc>
-    -->
   </target>
+  
   <target name="clean" ></target>
 
   <target name="cleanAll"></target>