X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FConf%2FBuildMacro.xml;h=71814450e532cb9b266fa9857052cef43fef195a;hb=fd6c41f5e24655889c4d2b33f1fb29e318ee3c82;hp=27315073cfce94a9dab5e9cda0b54f76461fcfec;hpb=32c8b5a94765118ae0552b60365f393ebbc41691;p=mirror_edk2.git

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 27315073cf..71814450e5 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -14,9 +14,70 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     Macro for intialize some properties. This Macro build will be called before source file build.  
     -->
   <macrodef name="Build_Init">
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+    
     <sequential>
       <var name="OBJECTS" value="" />
       <var name="SDB_FILES" value="" />
+
+      <if>
+        <and>
+          <isset property="PCH"/>
+          <not>
+            <equals arg1="${PCH}" arg2=""/>
+          </not>
+        </and>
+        <then>
+          <if>
+            <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
+            <then>
+              <makedeps DepsFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep">
+                <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+                <EXTRA.INC/>
+              </makedeps>
+            </then>
+          </if>
+    
+          <OnDependency>
+            <sourcefiles>
+              <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
+            </sourcefiles>
+            <targetfiles>
+              <file Name="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
+            </targetfiles>
+    
+            <sequential>
+              <!-- Generate pre-compiled header -->
+              <cc userdefine="on">
+                <command type="CC" cmd="${PCH}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                  outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj">
+                  <EXTRA.INC/>
+                  <argument value="${PCH_FLAGS}"/>
+                  <EXTRA.ARG/>
+                  <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+                </command>
+              </cc>
+
+              <if>
+                <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+                <then>
+                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>
+                </then>
+              </if>
+            </sequential>
+          </OnDependency>
+
+          <if>
+            <not>
+              <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+            </not>
+            <then>
+              <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>
+            </then>
+          </if>
+        </then>
+      </if>
     </sequential>
   </macrodef>
 
@@ -60,25 +121,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
 
         <sequential>
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
               outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">
               <EXTRA.INC/>
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
@@ -112,44 +159,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <var name="FILE_PATH" value="@{FILEPATH}" />
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
 
-      <if>
-        <available type="file" file="${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-        <then>
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep">
-            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
-            <EXTRA.INC/>
-          </makedeps>
-        </then>
-      </if>
-
-      <OnDependency>
-        <sourcefiles>
-          <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
-        </sourcefiles>
-        <targetfiles>
-          <file Name="${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-        </targetfiles>
-
-        <sequential>
-          <!-- Generate pre-compiled header -->
-          <if>
-            <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /TC /Yc /Fp${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-              <cc userdefine="on">
-                <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
-                    outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj" dpath="${CC_DPATH}">
-                  <EXTRA.INC/>
-                  <argument value="${LOCAL_CC_FLAGS}"/>
-                  <EXTRA.ARG/>
-                  <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/AutoGen.h"/>
-                </command>
-              </cc>
-            </then>
-          </if>
-        </sequential>
-      </OnDependency>
-
       <if>
         <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>
         <then>
@@ -170,22 +179,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
 
         <sequential>
-          <!-- Generate pre-compiled header -->
-          <if>
-            <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
                 outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">
               <EXTRA.INC/>
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
@@ -639,25 +637,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
         
         <sequential>
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yc${DEST_DIR_DEBUG}/AutoGen.h /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
                      includepathDelimiter="-I" dpath="${CC_DPATH}"
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj">
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.INC />
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
             </command>
@@ -716,25 +700,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <EXTRA.INC/>
           </vfrcompile>
     
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.h.gch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" 
                      includepathDelimiter="-I" family="${CC_FAMILY}" dpath="${CC_DPATH}"
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.INC/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>