now need to get m2
This commit is contained in:
@@ -61,9 +61,6 @@ DECLARE_BUILD_STAGE(libfpcbuild)
|
||||
ldProject = ccompiler->Compile(&compileProject);
|
||||
ldProject.linkType = ELINK_STATIC_LIBRARY;
|
||||
|
||||
if (linker->IsLibraryExists("clang"))
|
||||
ldProject.libraries.AppendTail("clang");
|
||||
|
||||
CUtlString outputProject = linker->Link(&ldProject);
|
||||
|
||||
|
||||
@@ -76,7 +73,7 @@ DECLARE_BUILD_STAGE(libfpc)
|
||||
if (linker->IsLibraryExists("clang"))
|
||||
g_libFpcFiles.AppendTail("library/clang/c_libclang.cpp");
|
||||
else
|
||||
V_printf("Warning: to support included files libclang must be installed.");
|
||||
V_printf("Warning: to support included files libclang must be installed.\n");
|
||||
CProject_t compileProject = {};
|
||||
LinkProject_t ldProject = {};
|
||||
|
||||
@@ -84,6 +81,11 @@ DECLARE_BUILD_STAGE(libfpc)
|
||||
compileProject.files = g_libFpcFiles;
|
||||
compileProject.includeDirectories = g_IncludeDirectories;
|
||||
compileProject.bFPIC = true;
|
||||
compileProject.macros = {
|
||||
{"FPC_ARCH", CUtlString("\"%s\"",Target_t::StringFromCPU(compileProject.m_target.cpu))},
|
||||
{"FPC_OS", CUtlString("\"%s\"",Target_t::StringFromKernel(compileProject.m_target.kernel))},
|
||||
{"FPC_ABI", CUtlString("\"%s\"",Target_t::StringFromABI(compileProject.m_target.abi))},
|
||||
};
|
||||
ldProject = ccompiler->Compile(&compileProject);
|
||||
ldProject.linkType = ELINK_DYNAMIC_LIBRARY;
|
||||
ldProject.libraryObjects = {
|
||||
@@ -112,21 +114,22 @@ DECLARE_BUILD_STAGE(fpc)
|
||||
compileProject.files = g_fpcFiles;
|
||||
compileProject.bFPIC = true;
|
||||
compileProject.includeDirectories = g_IncludeDirectories;
|
||||
compileProject.macros = {
|
||||
{"FPC_ARCH", CUtlString("\"%s\"",Target_t::StringFromCPU(compileProject.m_target.cpu))},
|
||||
{"FPC_OS", CUtlString("\"%s\"",Target_t::StringFromKernel(compileProject.m_target.kernel))},
|
||||
{"FPC_ABI", CUtlString("\"%s\"",Target_t::StringFromABI(compileProject.m_target.abi))},
|
||||
};
|
||||
ldProject = ccompiler->Compile(&compileProject);
|
||||
ldProject.libraryObjects = {
|
||||
GET_PROJECT_LIBRARY(tier0, "tier0"),
|
||||
GET_PROJECT_LIBRARY(tier1, "tier1"),
|
||||
GET_PROJECT_LIBRARY(tier2, "tier2"),
|
||||
};
|
||||
V_printf("WHAT %s\n",GET_PROJECT_LIBRARY(tier0, "tier0").GetString());
|
||||
|
||||
if (linker->IsLibraryExists("clang"))
|
||||
ldProject.libraries.AppendTail("clang");
|
||||
|
||||
CUtlString outputProject = linker->Link(&ldProject);
|
||||
|
||||
|
||||
ADD_OUTPUT_OBJECT("fpc", outputProject)
|
||||
ADD_OUTPUT_OBJECT("fpc", outputProject);
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user