diff options
| author | Martin Ridgers <[email protected]> | 2021-09-16 17:08:01 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-09-16 17:08:01 +0200 |
| commit | 8da2c13a34fd6394aecaf19490d65a8a84592e3c (patch) | |
| tree | 702cb3aec8145209fb5d8e39d8bf6d1432dd1a33 /zenutil/zenserverprocess.cpp | |
| parent | Another missing include (diff) | |
| parent | Compact binary package caching support (#9) (diff) | |
| download | zen-8da2c13a34fd6394aecaf19490d65a8a84592e3c.tar.xz zen-8da2c13a34fd6394aecaf19490d65a8a84592e3c.zip | |
Merge main into linux-mac
Diffstat (limited to 'zenutil/zenserverprocess.cpp')
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 00f5d4c0d..7f4be2368 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -367,7 +367,7 @@ ZenServerInstance::Shutdown() } void -ZenServerInstance::SpawnServer(int BasePort) +ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerArgs) { ZEN_ASSERT(!m_Process.IsValid()); // Only spawn once @@ -386,7 +386,7 @@ ZenServerInstance::SpawnServer(int BasePort) zen::ExtendableStringBuilder<32> LogId; LogId << "Zen" << ChildId; - zen::ExtendableWideStringBuilder<128> CommandLine; + zen::ExtendableWideStringBuilder<512> CommandLine; CommandLine << "\""; CommandLine.Append(Executable.c_str()); CommandLine << "\""; @@ -417,6 +417,11 @@ ZenServerInstance::SpawnServer(int BasePort) CommandLine << " --mesh"; } + if (!AdditionalServerArgs.empty()) + { + CommandLine << " " << AdditionalServerArgs; + } + std::filesystem::path CurrentDirectory = std::filesystem::current_path(); ZEN_DEBUG("Spawning server '{}'", LogId); |