mirror of https://github.com/acidanthera/audk.git
Add dependency for RealAsm file build rules and Use the module name in place of macro STRING_ARRAY_NAME
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2205 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
0026dbe0ac
commit
741fb36417
|
@ -651,7 +651,7 @@ Returns:
|
|||
//
|
||||
// Initialize strings to HII database
|
||||
//
|
||||
PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, STRING_ARRAY_NAME);
|
||||
PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);
|
||||
|
||||
Status = Hii->NewPack (Hii, PackageList, &StringHandle);
|
||||
ASSERT (!EFI_ERROR (Status));
|
||||
|
|
|
@ -24,7 +24,7 @@ Abstract:
|
|||
|
||||
|
||||
|
||||
extern UINT8 STRING_ARRAY_NAME[];
|
||||
extern UINT8 CpuStrings[];
|
||||
|
||||
//
|
||||
// Internal Data Structures
|
||||
|
|
|
@ -785,14 +785,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||
<element name="EXTRA.ARG" optional="yes"/>
|
||||
|
||||
<sequential>
|
||||
<!-- Lack Dependency Check -->
|
||||
<exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">
|
||||
<arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>
|
||||
</exec>
|
||||
<concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">
|
||||
<filelist dir="${MODULE_DIR}" files="Blank2.pad"/>
|
||||
<filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>
|
||||
</concat>
|
||||
<OnDependency>
|
||||
<sourcefiles>
|
||||
<file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
|
||||
</sourcefiles>
|
||||
<targetfiles>
|
||||
<file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>
|
||||
</targetfiles>
|
||||
|
||||
<sequential>
|
||||
<exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">
|
||||
<arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>
|
||||
</exec>
|
||||
<concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">
|
||||
<filelist dir="${MODULE_DIR}" files="Blank2.pad"/>
|
||||
<filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>
|
||||
</concat>
|
||||
</sequential>
|
||||
</OnDependency>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
|
|
Loading…
Reference in New Issue