lots of updates

This commit is contained in:
2026-02-19 00:39:20 +02:00
parent 898bf90504
commit 4dd2e13c48
53 changed files with 1495 additions and 250 deletions

View File

@@ -3,7 +3,8 @@
#include "ld.h"
#include "tier1/utlstring.h"
#define FUNNYSTDLIB "../external/funnystdlib/"
#define EXTERNAL "../external/"
#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");
@@ -26,7 +27,7 @@ CUtlVector<CUtlString> RenderContextVulkan_CompiledFiles = {
"vulkan/commands/transfer.cpp",
"vulkan/commands/base.cpp",
"vulkan/libraries/raster.cpp",
"../external/volk/volk.c",
EXTERNAL"volk/volk.c",
"gamewindow_sdl.cpp"
};
@@ -40,6 +41,7 @@ DECLARE_BUILD_STAGE(MaterialSystem)
compileProject.includeDirectories = {
"../public",
FUNNYSTDLIB"public",
EXTERNAL"SDL/include",
};
compileProject.bFPIC = true;
ldProject = ccompiler->Compile(&compileProject);
@@ -49,9 +51,9 @@ DECLARE_BUILD_STAGE(MaterialSystem)
};
ldProject.objects.AppendTail({GET_PROJECT_LIBRARY(tier1, "tier1")});
if (ldProject.m_target.kernel & TARGET_KERNEL_WINDOWS_DEVICES)
if (ldProject.m_target.kernel == TARGET_KERNEL_WINDOWS)
{
ldProject.libraries.AppendTail("pthread");
ldProject.libraryDirectories.AppendTail(EXTERNAL"windows");
};
CUtlString outputProject = linker->Link(&ldProject);
@@ -72,10 +74,11 @@ DECLARE_BUILD_STAGE(RenderSystemVulkan)
compileProject.includeDirectories = {
"../public",
FUNNYSTDLIB"public",
"../external/Vulkan-Headers/include",
"../external/Vulkan-Utility-Libraries/include",
"../external/VulkanMemoryAllocator/include",
"../external/volk"
EXTERNAL"SDL/include",
EXTERNAL"Vulkan-Headers/include",
EXTERNAL"Vulkan-Utility-Libraries/include",
EXTERNAL"VulkanMemoryAllocator/include",
EXTERNAL"volk"
};
compileProject.bFPIC = true;
ldProject = ccompiler->Compile(&compileProject);
@@ -84,11 +87,21 @@ DECLARE_BUILD_STAGE(RenderSystemVulkan)
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");
};
ldProject.libraries.AppendTail("SDL3");
if (ldProject.m_target.kernel == TARGET_KERNEL_WINDOWS)
{
ldProject.libraryDirectories.AppendTail(EXTERNAL"windows");
ldProject.libraries.AppendTail("winpthread-1");
ldProject.libraries.AppendTail("winmm");
ldProject.libraries.AppendTail("ole32");
ldProject.libraries.AppendTail("gdi32");
ldProject.libraries.AppendTail("oleaut32");
ldProject.libraries.AppendTail("setupapi");
ldProject.libraries.AppendTail("imm32");
ldProject.libraries.AppendTail("version");
ldProject.libraries.AppendTail("shell32");
ldProject.libraries.AppendTail("uuid");
};
CUtlString outputProject = linker->Link(&ldProject);
ADD_OUTPUT_OBJECT("RenderSystemVulkan", outputProject);