Small build fixes and empty trenchbroom path fix

This commit is contained in:
Er2
2025-03-03 19:48:54 +03:00
parent 29a57566c3
commit 0db2a36bf1
4 changed files with 19 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
project "Editor"
targetname ("Nuake Engine")
targetname "NuakeEngine"
kind "ConsoleApp"
language "C++"

View File

@@ -116,6 +116,9 @@ Ref<Project> Project::Load(std::string& path)
void Project::ExportEntitiesToTrenchbroom()
{
if (TrenchbroomPath == "")
return;
Ref<FGDFile> file = EntityDefinitionsFile;
file->BrushEntities.clear();

View File

@@ -1,4 +1,6 @@
group "Thirdparty"
include "Coral/Coral.Native"
include "Coral/Coral.Managed"
group ""
if not _OPTIONS["disable-dotnet"] then
include "Coral/Coral.Managed"
end
group ""

View File

@@ -19,6 +19,11 @@ newaction {
end
}
newoption {
trigger = "disable-dotnet",
description = "Disables dotnet build for makefile builders",
}
-- ╔═══════════════════════════════════════╗
-- ║ WORKSPACE ║
-- ╚═══════════════════════════════════════╝
@@ -53,8 +58,8 @@ workspace "Nuake"
architecture "x64"
outputdir = "Build/%{cfg.buildcfg}/"
binaryOutputDir = outputdir .. "Binaries/"
intBinaryOutputDir = outputdir .. "Binaries-Intermediate/"
binaryOutputDir = "%{wks.location}/" .. outputdir .. "Binaries/"
intBinaryOutputDir = "%{wks.location}/" .. outputdir .. "Binaries-Intermediate/"
globalDefines = {
"TRACY_ENABLE",
@@ -81,5 +86,7 @@ group ""
include "Nuake/premake5.lua"
include "Editor/premake5.lua"
include "Runtime/premake5.lua"
include "NuakeNet/premake5.lua"
include "EditorNet/premake5.lua"
if not _OPTIONS["disable-dotnet"] then
include "NuakeNet/premake5.lua"
include "EditorNet/premake5.lua"
end