made it work with new fpc
This commit is contained in:
@@ -2,13 +2,18 @@
|
||||
#include "c.h"
|
||||
#include "ld.h"
|
||||
#include "tier1/utlstring.h"
|
||||
#include "tier1/commandline.h"
|
||||
|
||||
#define FUNNYSTDLIB "../external/funnystdlib/"
|
||||
ADD_DEPENDENCY_BUILD_FILE(tier0, FUNNYSTDLIB"tier0/build.cpp");
|
||||
ADD_DEPENDENCY_BUILD_FILE(tier1, FUNNYSTDLIB"tier1/build.cpp");
|
||||
ADD_DEPENDENCY_BUILD_FILE(tier2, FUNNYSTDLIB"tier2/build.cpp");
|
||||
|
||||
CUtlVector<CUtlString> MaterialSystem_CompiledFiles = {
|
||||
"materialsystem.cpp",
|
||||
"compiledshader.cpp",
|
||||
};
|
||||
CUtlVector<CUtlString> RenderContextVulkan_CompiledFiles = {
|
||||
"compiledshader.cpp",
|
||||
"vulkan/shaderparser.cpp",
|
||||
"vulkan/rendercontext.cpp",
|
||||
"vulkan/commandbuffer.cpp",
|
||||
@@ -23,7 +28,6 @@ CUtlVector<CUtlString> RenderContextVulkan_CompiledFiles = {
|
||||
"vulkan/libraries/raster.cpp",
|
||||
"../external/volk/volk.c",
|
||||
};
|
||||
CUtlString material_lib;
|
||||
|
||||
DECLARE_BUILD_STAGE(MaterialSystem)
|
||||
{
|
||||
@@ -32,19 +36,33 @@ DECLARE_BUILD_STAGE(MaterialSystem)
|
||||
|
||||
compileProject.m_szName = "MaterialSystem";
|
||||
compileProject.files = MaterialSystem_CompiledFiles;
|
||||
compileProject.includeDirectories = { "../public" };
|
||||
compileProject.includeDirectories = {
|
||||
"../public",
|
||||
FUNNYSTDLIB"public",
|
||||
};
|
||||
compileProject.bFPIC = true;
|
||||
ldProject = ccompiler->Compile(&compileProject);
|
||||
ldProject.linkType = ELINK_DYNAMIC_LIBRARY;
|
||||
ldProject.libraryObjects = {
|
||||
GET_PROJECT_LIBRARY(tier0, "tier0"),
|
||||
};
|
||||
ldProject.objects.AppendTail({GET_PROJECT_LIBRARY(tier1, "tier1")});
|
||||
|
||||
if (ldProject.m_target.kernel & TARGET_KERNEL_WINDOWS_DEVICES)
|
||||
{
|
||||
ldProject.libraries.AppendTail("pthread");
|
||||
};
|
||||
|
||||
CUtlString outputProject = linker->Link(&ldProject);
|
||||
material_lib = outputProject;
|
||||
ADD_OUTPUT_OBJECT("MaterialSystem", outputProject);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DECLARE_BUILD_STAGE(RenderSystemVulkan)
|
||||
{
|
||||
if (Target_t::DefaultTarget().cpu == TARGET_CPU_WASM32)
|
||||
return 0;
|
||||
CProject_t compileProject = {};
|
||||
LinkProject_t ldProject = {};
|
||||
|
||||
@@ -52,6 +70,7 @@ DECLARE_BUILD_STAGE(RenderSystemVulkan)
|
||||
compileProject.files = RenderContextVulkan_CompiledFiles;
|
||||
compileProject.includeDirectories = {
|
||||
"../public",
|
||||
FUNNYSTDLIB"public",
|
||||
"../external/Vulkan-Headers/include",
|
||||
"../external/Vulkan-Utility-Libraries/include",
|
||||
"../external/VulkanMemoryAllocator/include",
|
||||
@@ -60,10 +79,17 @@ DECLARE_BUILD_STAGE(RenderSystemVulkan)
|
||||
compileProject.bFPIC = true;
|
||||
ldProject = ccompiler->Compile(&compileProject);
|
||||
ldProject.linkType = ELINK_DYNAMIC_LIBRARY;
|
||||
ldProject.libraries = { "vulkan" };
|
||||
ldProject.libraryObjects = {
|
||||
GET_PROJECT_LIBRARY(tier0, "tier0"),
|
||||
};
|
||||
ldProject.objects.AppendTail({GET_PROJECT_LIBRARY(tier1, "tier1")});
|
||||
if (ldProject.m_target.kernel & TARGET_KERNEL_WINDOWS_DEVICES)
|
||||
{
|
||||
ldProject.libraries.AppendTail("pthread");
|
||||
};
|
||||
|
||||
CUtlString outputProject = linker->Link(&ldProject);
|
||||
material_lib = outputProject;
|
||||
ADD_OUTPUT_OBJECT("RenderSystemVulkan", outputProject);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user