From 0db2a36bf19fae8463769c11f520d460f04facff Mon Sep 17 00:00:00 2001 From: Er2 Date: Mon, 3 Mar 2025 19:48:54 +0300 Subject: [PATCH] Small build fixes and empty trenchbroom path fix --- Editor/premake5.lua | 2 +- Nuake/Source/Nuake/Resource/Project.cpp | 3 +++ Nuake/Thirdparty/coral_p5.lua | 6 ++++-- premake5.lua | 15 +++++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Editor/premake5.lua b/Editor/premake5.lua index 45bc4ddd..e8dfcae8 100644 --- a/Editor/premake5.lua +++ b/Editor/premake5.lua @@ -1,5 +1,5 @@ project "Editor" - targetname ("Nuake Engine") + targetname "NuakeEngine" kind "ConsoleApp" language "C++" diff --git a/Nuake/Source/Nuake/Resource/Project.cpp b/Nuake/Source/Nuake/Resource/Project.cpp index 6469b7c4..21cbd0a9 100644 --- a/Nuake/Source/Nuake/Resource/Project.cpp +++ b/Nuake/Source/Nuake/Resource/Project.cpp @@ -116,6 +116,9 @@ Ref Project::Load(std::string& path) void Project::ExportEntitiesToTrenchbroom() { + if (TrenchbroomPath == "") + return; + Ref file = EntityDefinitionsFile; file->BrushEntities.clear(); diff --git a/Nuake/Thirdparty/coral_p5.lua b/Nuake/Thirdparty/coral_p5.lua index 2248d0b5..0acdc7fa 100644 --- a/Nuake/Thirdparty/coral_p5.lua +++ b/Nuake/Thirdparty/coral_p5.lua @@ -1,4 +1,6 @@ group "Thirdparty" include "Coral/Coral.Native" -include "Coral/Coral.Managed" -group "" \ No newline at end of file +if not _OPTIONS["disable-dotnet"] then + include "Coral/Coral.Managed" +end +group "" diff --git a/premake5.lua b/premake5.lua index 2b3207f2..7b7e5f79 100644 --- a/premake5.lua +++ b/premake5.lua @@ -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