mirror of
https://github.com/antopilo/Nuake.git
synced 2026-09-09 20:08:57 +03:00
Small build fixes and empty trenchbroom path fix
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
project "Editor"
|
||||
targetname ("Nuake Engine")
|
||||
targetname "NuakeEngine"
|
||||
|
||||
kind "ConsoleApp"
|
||||
language "C++"
|
||||
|
||||
@@ -116,6 +116,9 @@ Ref<Project> Project::Load(std::string& path)
|
||||
|
||||
void Project::ExportEntitiesToTrenchbroom()
|
||||
{
|
||||
if (TrenchbroomPath == "")
|
||||
return;
|
||||
|
||||
Ref<FGDFile> file = EntityDefinitionsFile;
|
||||
|
||||
file->BrushEntities.clear();
|
||||
|
||||
6
Nuake/Thirdparty/coral_p5.lua
vendored
6
Nuake/Thirdparty/coral_p5.lua
vendored
@@ -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 ""
|
||||
|
||||
15
premake5.lua
15
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
|
||||
|
||||
Reference in New Issue
Block a user