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

some work on fpc

Browse Source
This commit is contained in:
kotofyt
2025-12-30 22:13:01 +02:00
parent 842eeabbde
commit 773a541199
27 changed files with 298 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
fpc/library/builder.cpp
View File

@@ -2,6 +2,9 @@
#include "ld.h"
#include "c.h"
CUtlVector<BuildFileInfo_t> buildFileInfos = {};
class CProjectBuilder : public IProjectBuilder
{
public:
@@ -20,6 +23,26 @@ IProjectBuilder *ProjectBuilder()
return &s_projectBuilder;
};
CUtlString FPC_GetProjectObject( const char *szName, const char *szObjectName )
{
for (auto b: buildFileInfos)
{
for (auto s: b.m_stages)
{
if (strcmp(s->m_psz, szName))
continue;
for (auto o: s->m_outputs)
{
if (strcmp(o.m_szName, szObjectName))
continue;
return o.m_szPath;
}
}
}
return NULL;
}
BuildFile_t *CProjectBuilder::BuildProject( const char *szProjectName, const char *szPath )
{
CProject_t stCompileProject = {};
@@ -30,7 +53,8 @@ BuildFile_t *CProjectBuilder::BuildProject( const char *szProjectName, const cha
BuildFileInfo_t *pBuildFileInfo;
BuildFileInfo_t stBuildFileInfo;
BuildFile_t *pBuildFile = NULL;
CBuildStage **ppExecutedBuildStage = NULL;
GetProjectObjectFn *pfnGetProjectObject = NULL;
CUtlString szWd = CUtlString(szPath).GetDirectory();
Plat_SetWorkingDir(szWd);
@@ -40,16 +64,17 @@ BuildFile_t *CProjectBuilder::BuildProject( const char *szProjectName, const cha
stCompileProject.files = {
szPath,
};
stCompileProject.includeDirectories = {CUtlString("%s/public",filesystem2->OwnDirectory()),CUtlString("%s/public", filesystem2->BuildDirectory()), CUtlString("%s/../public",filesystem2->OwnDirectory()),CUtlString("%s/../public", filesystem2->BuildDirectory())};
stCompileProject.includeDirectories = {CUtlString("%s/public",filesystem2->OwnDirectory())};
stCompileProject.bFPIC = true;
stCompileProject.m_target = Target_t::HostTarget();
stLinkProject = ccompiler->Compile(&stCompileProject);
stLinkProject.linkType = ELINK_DYNAMIC_LIBRARY;
stLinkProject.m_target = Target_t::HostTarget();
stLinkProject.objects.AppendHead({CUtlString("%s/libfpcbuild.a",filesystem2->OwnDirectory())});
stLinkProject.objects.AppendHead({CUtlString("%s/libtier2.a",filesystem2->OwnDirectory())});
stLinkProject.objects.AppendHead({CUtlString("%s/libtier1.a",filesystem2->OwnDirectory())});
stLinkProject.libraryObjects.AppendHead({CUtlString("%s/libfpcbuild.a",filesystem2->OwnDirectory())});
stLinkProject.libraryObjects.AppendHead({CUtlString("%s/libfpc.so",filesystem2->OwnDirectory())});
stLinkProject.libraryObjects.AppendHead({CUtlString("%s/libtier2.a",filesystem2->OwnDirectory())});
stLinkProject.libraryObjects.AppendHead({CUtlString("%s/libtier1.a",filesystem2->OwnDirectory())});
szBuildLibrary = linker->Link(&stLinkProject);
pLibrary = Plat_LoadLibrary(szBuildLibrary);
@@ -64,17 +89,21 @@ BuildFile_t *CProjectBuilder::BuildProject( const char *szProjectName, const cha
return NULL;
}
pBuildFileInfo = (BuildFileInfo_t*)pBuildFactory(BUILD_FILE_INFO_INTERFACE_NAME, NULL);
if (!pBuildFileInfo)
pBuildFileInfo = (BuildFileInfo_t*)pBuildFactory(BUILD_FILE_INFO_INTERFACE_VERSION, NULL);
ppExecutedBuildStage = (CBuildStage**)pBuildFactory(BUILD_CURRENT_STAGE_INTERFACE_VERSION, NULL);
pfnGetProjectObject = (GetProjectObjectFn*)pBuildFactory(BUILD_GET_PROJECT_OBJECT_INTERFACE_VERSION, NULL);
if (!pBuildFileInfo || !ppExecutedBuildStage || !pfnGetProjectObject)
{
V_printf("Failed to find build file info interface\n");
V_printf("Required interfaces are not present\n");
Plat_UnloadLibrary(szBuildLibrary);
return NULL;
}
stBuildFileInfo = *pBuildFileInfo;
buildFileInfos.AppendTail(stBuildFileInfo);
*pfnGetProjectObject = FPC_GetProjectObject;
for (auto a: stBuildFileInfo.m_dependantFiles)
{
BuildProject("something", CUtlString("%s/build.cpp",a));
BuildProject("something", CUtlString("%s/%s/build.cpp",szWd.GetString(),a));
}
Plat_SetWorkingDir(szWd);
@@ -82,7 +111,14 @@ BuildFile_t *CProjectBuilder::BuildProject( const char *szProjectName, const cha
for (auto &build: stBuildFileInfo.m_stages)
{
*ppExecutedBuildStage = build;
build->m_pMainFn();
for ( auto &o: build->m_outputs)
{
o.m_szPath.AppendHead("/");
o.m_szPath.AppendHead(Plat_GetWorkingDir());
printf("%s: %s = %s\n",build->m_psz,o.m_szName, o.m_szPath.GetString());
};
};
pBuildFile = new BuildFile_t;

12
fpc/library/c.cpp
View File

@@ -7,7 +7,16 @@ ICCompiler *ccompiler;
CUtlString ICCompiler::GetOutputObjectName( CProject_t *pProject, unsigned int hash, CUtlString szFileName )
{
CUtlString szTarget = pProject->m_target.GetTriplet();
return CUtlString("%s/%s/cc/%u_%s/%s/%s%s",FPC_TEMPORAL_DIRNAME, szTarget.GetString(), hash, pProject->m_szName.GetString(), filesystem2->BuildDirectory(), szFileName.GetString(), GetOutputObjectFormat());
return CUtlString(
"%s/%s/cc/%u_%s/%s/%s%s",
FPC_TEMPORAL_DIRNAME,
szTarget.GetString(),
hash,
pProject->m_szName.GetString(),
filesystem2->BuildDirectory(),
szFileName.GetString(),
GetOutputObjectFormat());
};
CUtlVector<CUtlString> ICCompiler::BuildCommandLine( CProject_t *pProject, const char *szFileName, const char *szOutputFileName )
@@ -44,6 +53,7 @@ LinkProject_t ICCompiler::Compile( CProject_t *pProject )
proj.m_androidmanifest = pProject->m_androidmanifest;
unsigned int hash = pProject->GenerateProjectHash();
// Get output directories
for (auto &file: pProject->files)
{

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

@@ -156,7 +156,7 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
}
if (pProject->m_target.kernel == TARGET_KERNEL_LINUX || pProject->m_target.kernel == TARGET_KERNEL_ANDROID)
{
//args.AppendTail("-rdynamic");
args.AppendTail("-Wl,--disable-new-dtags");
args.AppendTail("-Wl,-rpath,$ORIGIN");
}
@@ -174,6 +174,8 @@ CUtlString CClangLinker::Link( LinkProject_t *pProject )
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");
for (auto object: pProject->libraryObjects)
args.AppendTail(object);
// Libraries
for (auto lib: pProject->libraries)

18
fpc/library/helper.cpp
View File

@@ -35,7 +35,8 @@ static uint32_t pathSize = sizeof(path);
static int pathResult = _NSGetExecutablePath(path, &pathSize);
#endif
static char *szPathDir = dirname(path);
char *g_szBuildDir = 0;
static char *s_szBuildDir = 0;
EXPOSE_INTERFACE_GLOBALVAR(szBuildDir, char*, FILE_SYSTEM_2_BUILD_DIRECTORY_INTERFACE_VERSION, s_szBuildDir);
class CPOSIXFileSystem2: public IFileSystem2
{
@@ -87,24 +88,26 @@ char *CPOSIXFileSystem2::OwnDirectory()
};
char *CPOSIXFileSystem2::BuildDirectory()
{
return g_szBuildDir;
return s_szBuildDir;
};
void CPOSIXFileSystem2::CopyFile( const char *szDestination, const char *szOrigin )
{
CUtlVector<CUtlString> args = {
CUtlString(szOrigin),
CUtlString(szDestination),
szOrigin,
szDestination,
};
runner->Run("cp", args);
printf("runner: %p\n",runner);
runner->Run(CUtlString("cp"), args);
printf("runner: %p\n",runner);
runner->Wait();
}
void CPOSIXFileSystem2::CopyDirectory( const char *szDestination, const char *szOrigin )
{
CUtlVector<CUtlString> args = {
"-r",
CUtlString(szOrigin),
CUtlString(szDestination),
szOrigin,
szDestination,
};
runner->Run("cp", args);
runner->Wait();
@@ -133,4 +136,5 @@ bool CPOSIXFileSystem2::ShouldRecompile(const char *szSource, const char *szOutp
return outbuf.st_mtime < srcbuf.st_mtime;
};
IINIFile *g_pConfig;

15
fpc/library/libfpc.cpp Normal file
View File

@@ -0,0 +1,15 @@
#include "helper.h"
#include "runner.h"
#include "c.h"
#include "ld.h"
void *LibFpcInit()
{
filesystem2 = (IFileSystem2*)CreateInterface(FILE_SYSTEM_2_INTERFACE_NAME, NULL);
runner = (IRunner*)CreateInterface(RUNNER_INTERFACE_NAME, NULL);
ccompiler = (ICCompiler*)CreateInterface(CLANG_C_COMPILER_INTERFACE_NAME, NULL);
linker = (ILinker*)CreateInterface(CLANG_LINKER_INTERFACE_NAME, NULL);
return NULL;
}
EXPOSE_INTERFACE_FN(LibFpcInit, LibFpcInit, LIBFPC_INIT_INTERFACE_VERSION);

22
fpc/library/runner.cpp
View File

@@ -9,8 +9,8 @@
#include "winerunner.h"
CUtlVector<pid_t> g_processes;
CUtlVector<pid_t> m_processes;
class CPOSIXRunner: public IRunner
{
public:
@@ -51,7 +51,9 @@ int CPOSIXRunner::Run(CUtlString szName, CUtlVector<CUtlString>& args)
_exit(0);
}
}
g_processes.AppendTail(pid);
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
m_processes.AppendTail(pid);
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
return 0;
}
@@ -83,7 +85,9 @@ int CPOSIXRunner::Run(CUtlString szName, CUtlString szDirectory, CUtlVector<CUtl
_exit(0);
}
}
g_processes.AppendTail(pid);
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
m_processes.AppendTail(pid);
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
/* parent */
return 0;
}
@@ -95,11 +99,17 @@ int CPOSIXRunner::Run(CUtlString szName, CUtlString szDirectory, CUtlVector<CUtl
int CPOSIXRunner::Wait( void )
{
for (auto &process: g_processes)
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
if (m_processes.GetSize())
printf("%i\n",m_processes[0]);
printf("%i %p\n",m_processes.GetSize(),m_processes.GetData());
for (int i = 0; i<m_processes.GetSize(); i++)
{
printf("p %i\n",m_processes[i]);
int status;
pid_t wpid = waitpid(process, &status, 0);
pid_t wpid = waitpid(m_processes[i], &status, 0);
}
g_processes = {};
m_processes = {};
return 0;
};

10
fpc/library/windows/runner.cpp
View File

@@ -6,7 +6,6 @@
#include "tier1/commandline.h"
#include "windows.h"
CUtlVector<pid_t> g_processes;
class CWindowsRunner: public IRunner
{
@@ -15,6 +14,7 @@ public:
virtual int Run( CUtlString szName, CUtlString szDirectory, CUtlVector<CUtlString>& args ) override;
virtual int Run( CUtlString szName, CUtlString szDirectory, CUtlVector<CUtlString>& args, CUtlVector<CUtlString>& environment ) override;
virtual int Wait( void ) override;
CUtlVector<pid_t> s_processes = {};
};
EXPOSE_INTERFACE(CWindowsRunner, IRunner, POSIX_RUNNER_INTERFACE_NAME);
@@ -47,7 +47,7 @@ int CWindowsRunner::Run(CUtlString szName, CUtlVector<CUtlString>& args)
_exit(0);
}
}
g_processes.AppendTail(pid);
s_processes.AppendTail(pid);
return 0;
}
@@ -79,7 +79,7 @@ int CWindowsRunner::Run(CUtlString szName, CUtlString szDirectory, CUtlVector<CU
_exit(0);
}
}
g_processes.AppendTail(pid);
s_processes.AppendTail(pid);
/* parent */
return 0;
}
@@ -91,11 +91,11 @@ int CWindowsRunner::Run(CUtlString szName, CUtlString szDirectory, CUtlVector<CU
int CWindowsRunner::Wait( void )
{
for (auto &process: g_processes)
for (auto &process: s_processes)
{
int status;
pid_t wpid = waitpid(process, &status, 0);
}
g_processes = {};
s_processes = {};
return 0;
};