kotofyt/funnygame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved lots of stuff

Browse Source
This commit is contained in:
kotofyt
2025-08-06 00:12:36 +03:00
parent 817ed344b4
commit 5635cd1d69
27 changed files with 348 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fpc/build.cpp
View File

@@ -37,6 +37,10 @@ CUtlVector<CUtlString> g_IncludeDirectories = {
DECLARE_BUILD_STAGE(fpc)
{
if (linker->IsLibraryExists("clang"))
g_CompiledFiles.AppendTail("library/clang/c_libclang.cpp");
else
V_printf("Warning: to support included files libclang must be installed.");
CProject_t compileProject = {};
LinkProject_t ldProject = {};
@@ -44,6 +48,8 @@ DECLARE_BUILD_STAGE(fpc)
compileProject.files = g_CompiledFiles;
compileProject.includeDirectories = g_IncludeDirectories;
ldProject = ccompiler->Compile(&compileProject);
if (linker->IsLibraryExists("clang"))
ldProject.libraries.AppendTail("clang");
CUtlString outputProject = linker->Link(&ldProject);

35
fpc/library/clang/c.cpp
View File

@@ -1,9 +1,11 @@
#include "c.h"
#include "c_libclang.h"
#include "helper.h"
#include "obj.h"
#include "target.h"
#include "tier0/lib.h"
#include "tier0/platform.h"
#include "tier1/commandline.h"
#include "tier1/interface.h"
#include "tier1/utlstring.h"
#include "tier1/utlvector.h"
@@ -26,14 +28,26 @@ public:
EXPOSE_INTERFACE(CClangCompiler, ICCompiler, CLANG_C_COMPILER_INTERFACE_NAME);
CUtlVector<ClangFile_t> g_clangFiles;
IClangBackend *clangbackend = NULL;
LinkProject_t CClangCompiler::Compile( CProject_t *pProject )
{
if (!clangbackend && CommandLine()->CheckParam("-experimental_header_include"))
clangbackend = (IClangBackend*)CreateInterface(CLANG_BACKEND_INTERFACE_NAME, NULL);
V_printf("CLANG: %p\n", clangbackend);
if (pProject->m_szName == 0)
{
Plat_FatalErrorFunc("m_szName must be present\n");
}
LinkProject_t proj = {};
proj.m_szName = pProject->m_szName;
proj.m_target = pProject->m_target;
proj.m_androidmanifest = pProject->m_androidmanifest;
unsigned int hash = pProject->GenerateProjectHash();
// Get output directories
for (auto &file: pProject->files)
{
CUtlString szTarget = pProject->m_target.GetTriplet();
@@ -42,12 +56,16 @@ LinkProject_t CClangCompiler::Compile( CProject_t *pProject )
szOutputDir = dirname(szOutputDir);
filesystem2->MakeDirectory(szOutputDir);
}
// Run CC
for (auto &file: pProject->files)
{
CUtlVector<CUtlString> args;
V_printf(" CC %s\n", file.GetString());
CUtlVector<CUtlString> args;
CUtlString szTarget = pProject->m_target.GetTriplet();
CUtlString szCompiledTarget = szTarget;
bool bAreDependenciesUpdated = false;
if (pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
{
szCompiledTarget = CUtlString("%s%u", szTarget.GetString(), pProject->m_androidmanifest.m_nTargetVersion);
@@ -57,11 +75,6 @@ LinkProject_t CClangCompiler::Compile( CProject_t *pProject )
args = {
"-target",
szCompiledTarget,
"-g",
"-c",
"-o",
szOutputFile,
file,
};
if (!strcmp(Plat_GetExtension(file),"cpp"))
args.AppendTail("-std=c++17");
@@ -106,9 +119,17 @@ LinkProject_t CClangCompiler::Compile( CProject_t *pProject )
args.AppendTail("-include");
args.AppendTail(include);
}
if (!filesystem2->ShouldRecompile(file, szOutputFile))
if (clangbackend)
bAreDependenciesUpdated = clangbackend->AreFileDependenciesUpdated(file, szOutputFile, args);
if (!filesystem2->ShouldRecompile(file, szOutputFile) && !bAreDependenciesUpdated)
goto skipcompile;
args.AppendTail("-c");
args.AppendTail("-o");
args.AppendTail(szOutputFile);
args.AppendTail(file);
if (pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
{
if (!pProject->m_target.szSysroot)

64
fpc/library/clang/c_libclang.cpp Normal file
View File

@@ -0,0 +1,64 @@
#include "c_libclang.h"
#include "helper.h"
#include "tier1/interface.h"
#include "clang-c/Index.h"
#include <clang-c/CXFile.h>
#include <clang-c/CXString.h>
class CClangBackend: public IClangBackend
{
public:
virtual bool AreFileDependenciesUpdated( CUtlString szFile, CUtlString szOutputFile, CUtlVector<CUtlString> arguments ) override;
bool bAnyOutdated;
CUtlString szCurrentFile;
private:
static void InclusionVisitor( CXFile included_file, CXSourceLocation *include_stack, unsigned include_len, CXClientData client_data );
};
EXPOSE_INTERFACE(CClangBackend, IClangBackend, CLANG_BACKEND_INTERFACE_NAME);
bool CClangBackend::AreFileDependenciesUpdated( CUtlString szFile, CUtlString szOutputFile, CUtlVector<CUtlString> arguments )
{
szCurrentFile = szOutputFile;
bAnyOutdated = false;
CUtlVector<const char *> cArguments = {};
for (auto &arg: arguments)
cArguments.AppendTail(arg);
CXIndex index = clang_createIndex(0, 0);
CXTranslationUnit tu;
CXErrorCode err = clang_parseTranslationUnit2(index, szFile.GetString(), cArguments.GetData(), cArguments.GetSize(), NULL, 0, 0, &tu);
if (err != CXError_Success) {
printf("clang_parseTranslationUnit2 failed with error code %d\n", err);
return false;
}
clang_getInclusions(tu, CClangBackend::InclusionVisitor, NULL);
clang_disposeTranslationUnit(tu);
clang_disposeIndex(index);
return bAnyOutdated;
}
void CClangBackend::InclusionVisitor( CXFile included_file, CXSourceLocation *include_stack, unsigned include_len, CXClientData client_data )
{
if (((CClangBackend*)clangbackend)->bAnyOutdated)
return;
CXString filename = clang_getFileName(included_file);
bool bUpdate =
filesystem2->ShouldRecompile(clang_getCString(filename), ((CClangBackend*)clangbackend)->szCurrentFile);
if (bUpdate)
{
((CClangBackend*)clangbackend)->bAnyOutdated = true;
}
clang_disposeString(filename);
}

17
fpc/library/clang/c_libclang.h Normal file
View File

@@ -0,0 +1,17 @@
#ifndef C_LIBCLANG_H
#define C_LIBCLANG_H
#include "tier0/platform.h"
#include "tier1/utlstring.h"
#define CLANG_BACKEND_INTERFACE_NAME "ClangBackend001"
abstract_class IClangBackend
{
public:
virtual bool AreFileDependenciesUpdated( CUtlString szFile, CUtlString szOutputFile, CUtlVector<CUtlString> arguments ) = 0;
};
extern IClangBackend *clangbackend;
#endif

50
fpc/library/clang/ld.cpp
View File

@@ -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;
}

2
fpc/public/ld.h
View File

@@ -78,6 +78,8 @@ public:
// Links project
virtual CUtlString Link( LinkProject_t *pProject ) = 0;
virtual bool IsLibraryExists( CUtlString szName ) = 0;
};
extern ILinker *linker;