improved lots of stuff
This commit is contained in:
@@ -10,12 +10,19 @@ class CClangLinker : public ILinker
|
||||
{
|
||||
public:
|
||||
virtual CUtlString Link( LinkProject_t *pProject ) override;
|
||||
virtual bool IsLibraryExists( CUtlString szName ) override;
|
||||
};
|
||||
|
||||
EXPOSE_INTERFACE(CClangLinker, ILinker, CLANG_LINKER_INTERFACE_NAME);
|
||||
|
||||
CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
{
|
||||
if (pProject->m_szName == 0)
|
||||
{
|
||||
Plat_FatalErrorFunc("m_szName must be present\n");
|
||||
}
|
||||
|
||||
// Find a name for the file
|
||||
CUtlString szFileName;
|
||||
unsigned int hash = pProject->GenerateProjectHash();
|
||||
switch(pProject->linkType)
|
||||
@@ -66,11 +73,14 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
for (auto object: pProject->objects)
|
||||
args.AppendTail(object.m_szObjectFile);
|
||||
runner->Run("ar", args);
|
||||
runner->Wait();
|
||||
runner->Wait();
|
||||
|
||||
} else {
|
||||
V_printf(" LINK %s\n", pProject->m_szName.GetString());
|
||||
bool shouldRecompile = false;
|
||||
CUtlVector<CUtlString> args;
|
||||
|
||||
// Check if any of the files have changed
|
||||
for (auto object: pProject->objects)
|
||||
{
|
||||
if (filesystem2->ShouldRecompile(object.m_szObjectFile,szOutputFile))
|
||||
@@ -81,6 +91,8 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
}
|
||||
if (!shouldRecompile)
|
||||
goto compiled;
|
||||
|
||||
|
||||
CUtlString szTarget = pProject->m_target.GetTriplet();
|
||||
CUtlString szCompiledTarget = szTarget;
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
@@ -93,14 +105,20 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
"-target",
|
||||
szCompiledTarget,
|
||||
};
|
||||
|
||||
// Disable stdlib
|
||||
if (pProject->bNoStdLib)
|
||||
{
|
||||
args.AppendTail("-nostdlib");
|
||||
}
|
||||
|
||||
// Sysroots
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_DARWIN)
|
||||
{
|
||||
args.AppendTail("-isysroot");
|
||||
args.AppendTail("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk");
|
||||
|
||||
// Shouldn't be here
|
||||
args.AppendTail("-Wl,-export_dynamic");
|
||||
args.AppendTail("-undefined");
|
||||
args.AppendTail("dynamic_lookup");
|
||||
@@ -109,21 +127,26 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
{
|
||||
args.AppendTail("-isysroot");
|
||||
args.AppendTail("/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk");
|
||||
args.AppendTail("-miphoneos-version-min=18.0 ");
|
||||
// Shouldn't be here ?
|
||||
args.AppendTail("-fembed-bitcode");
|
||||
args.AppendTail("-Wl,-rpath,@executable_path");
|
||||
args.AppendTail("-Wl,-all_load");
|
||||
args.AppendTail("-w");
|
||||
args.AppendTail("-miphoneos-version-min=18.0 ");
|
||||
}
|
||||
else if (pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
{
|
||||
args.AppendTail(CUtlString("--sysroot=%s/sysroot", pProject->m_target.szSysroot));
|
||||
|
||||
// Shouldn't be here ?
|
||||
args.AppendTail("-static-libstdc++");
|
||||
}
|
||||
else if (pProject->m_target.szSysroot)
|
||||
{
|
||||
args.AppendTail(CUtlString("--sysroot=%s", pProject->m_target.szSysroot));
|
||||
}
|
||||
|
||||
// Magic for the systems
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_WINDOWS)
|
||||
{
|
||||
args.AppendTail("-fuse-ld=ld");
|
||||
@@ -132,21 +155,30 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
{
|
||||
args.AppendTail("-rdynamic");
|
||||
}
|
||||
|
||||
// Dynamic libraries
|
||||
// Android can't run executables
|
||||
if (pProject->linkType == ELINK_DYNAMIC_LIBRARY || pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
{
|
||||
args.AppendTail("-shared");
|
||||
}
|
||||
|
||||
// All the objects
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_WINDOWS || pProject->m_target.kernel == TARGET_KERNEL_LINUX || pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
args.AppendTail("-Wl,--whole-archive");
|
||||
for (auto object: pProject->objects)
|
||||
args.AppendTail(object.m_szObjectFile);
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_WINDOWS || pProject->m_target.kernel == TARGET_KERNEL_LINUX || pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
args.AppendTail("-Wl,--no-whole-archive");
|
||||
|
||||
// Libraries
|
||||
for (auto lib: pProject->libraries)
|
||||
{
|
||||
args.AppendTail("-l");
|
||||
args.AppendTail(lib);
|
||||
}
|
||||
|
||||
// Apple frameworks
|
||||
for (auto &directory: pProject->frameworkDirectories)
|
||||
{
|
||||
args.AppendTail("-F");
|
||||
@@ -157,10 +189,12 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
args.AppendTail("-framework");
|
||||
args.AppendTail(framework);
|
||||
}
|
||||
|
||||
// Android SDK requires sysroot
|
||||
if (pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
|
||||
{
|
||||
if (!pProject->m_target.szSysroot)
|
||||
Plat_FatalErrorFunc("-sysroot must be specified for android\n");
|
||||
Plat_FatalErrorFunc("szSysroot must be specified for android\n");
|
||||
runner->Run(CUtlString("%s/bin/clang++",pProject->m_target.szSysroot), args);
|
||||
|
||||
}
|
||||
@@ -173,3 +207,13 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
|
||||
compiled:
|
||||
return szOutputFile;
|
||||
};
|
||||
|
||||
bool CClangLinker::IsLibraryExists( CUtlString szName )
|
||||
{
|
||||
szName = CUtlString("lib%s.so", szName.GetString());
|
||||
void *pLib = Plat_LoadLibrary(szName.GetString());
|
||||
if (!pLib)
|
||||
return false;
|
||||
Plat_UnloadLibrary(pLib);
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user