tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix building error in Linux

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2165 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2007-01-04 06:08:27 +00:00
parent 8d4243f1bd
commit 327bd141ad
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/CCode/Source/GenFvMap/GenFvMap.cpp
View File

@ -8,11 +8,11 @@
//** from the company. //** from the company.
//** //**
//**************************************************************************** //****************************************************************************
#include "ProcessorBind.h"
#include <iostream>
#include <stdexcept> #include <stdexcept>
#include <list> #include <list>
#include <map> #include <map>
#include <iostream>
#include <iomanip> #include <iomanip>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
@ -22,7 +22,7 @@
#include <functional> #include <functional>
using namespace std; using namespace std;
typedef unsigned __int64 ulonglong_t; typedef UINT64 ulonglong_t;
template <class T> template <class T>
class CMemoryLeakChecker : public list<T*> class CMemoryLeakChecker : public list<T*>
@ -142,7 +142,7 @@ ostream& operator << (ostream& os, const CIdentity& idRight)
<< setw(4) << (unsigned short)(idRight.m_ullId[0] >> 16) << '-' << setw(4) << (unsigned short)(idRight.m_ullId[0] >> 16) << '-'
<< setw(4) << (unsigned short)idRight.m_ullId[0] << '-' << setw(4) << (unsigned short)idRight.m_ullId[0] << '-'
<< setw(4) << (unsigned short)(idRight.m_ullId[1] >> 48) << '-' << setw(4) << (unsigned short)(idRight.m_ullId[1] >> 48) << '-'
<< setw(12) << (idRight.m_ullId[1] & 0xffffffffffff); << setw(12) << (idRight.m_ullId[1] & 0xffffffffffffULL);
} }
class CInputFile : public CObjRoot class CInputFile : public CObjRoot

20
Tools/CCode/Source/GenFvMap/build.xml
View File

@ -33,15 +33,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</target> </target>
<target name="Tool" depends="init"> <target name="Tool" depends="init">
<condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
<os family="mac"/>
</condition>
<condition property="gxx_extra_libs" value="stdc++">
<os name="linux"/>
</condition>
<condition property="gxx_extra_libs" value="stdc++">
<os family="windows"/>
</condition>
<cc name="${ToolChain}" objdir="${BUILD_DIR}" <cc name="${ToolChain}" objdir="${BUILD_DIR}"
outfile="${BIN_DIR}/${ToolName}" outfile="${BIN_DIR}/${ToolName}"
outtype="executable" outtype="executable"
debug="true" debug="true"
optimize="speed"> optimize="speed">
<compilerarg value="${ExtraArgus}" if="ExtraArgus" /> <compilerarg value="${ExtraArgus}" if="ExtraArgus" />
<compilerarg value="/EHsc" unless="GCC"/> <compilerarg value="/EHsc" unless="gcc"/>
<compilerarg value="/Za" unless="GCC"/> <compilerarg value="/Za" unless="gcc"/>
<compilerarg value="-x c++" if="gcc"/>
<fileset dir="${basedir}/${ToolName}" <fileset dir="${basedir}/${ToolName}"
includes="${FileSet}" includes="${FileSet}"
defaultexcludes="TRUE" defaultexcludes="TRUE"
@ -51,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Include/${HostArch}"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
<syslibset libs="${gxx_extra_libs}" if="gcc"/>
</cc> </cc>
</target> </target>