diff options
| author | Aki <please@ignore.pl> | 2024-03-09 23:02:17 +0100 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2024-03-09 23:02:17 +0100 |
| commit | e1606f9bbc45e7ba57c461dc1ca4d4a86c5d76dd (patch) | |
| tree | d13c968b28d8f9a076b7fed0d6f098fc448ce87c /Starserver | |
| parent | eced12a69603e23d6869f92a2d5302f4605354ba (diff) | |
| download | starshatter-e1606f9bbc45e7ba57c461dc1ca4d4a86c5d76dd.zip starshatter-e1606f9bbc45e7ba57c461dc1ca4d4a86c5d76dd.tar.gz starshatter-e1606f9bbc45e7ba57c461dc1ca4d4a86c5d76dd.tar.bz2 | |
Replaced MachineInfo with stripped cross-platform solution
It could easily handle more, but is there really need for it? Having
some information about the machine in logs is nice, but with the
current state of affairs most of errors are coming from bad pointer
uses than anything else...
InfoEx is STATIC, because it seems FoundationEx can cause multiple
definitions in scenarios like this.
Diffstat (limited to 'Starserver')
| -rw-r--r-- | Starserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Starserver/Main.cpp | 16 | ||||
| -rw-r--r-- | Starserver/NetAdminServer.cpp | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Starserver/CMakeLists.txt b/Starserver/CMakeLists.txt index 43e3d29..e492234 100644 --- a/Starserver/CMakeLists.txt +++ b/Starserver/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories( ) target_link_libraries( Starserver - PRIVATE StarsEx + PRIVATE StarsEx InfoEx ) install( TARGETS Starserver diff --git a/Starserver/Main.cpp b/Starserver/Main.cpp index 0063060..a92df86 100644 --- a/Starserver/Main.cpp +++ b/Starserver/Main.cpp @@ -4,12 +4,13 @@ Copyright (c) 1997-2006, Destroyer Studios LLC. */ -#include "MachineInfo.h" -#include "NetLayer.h" -#include "Panic.h" -#include "StarServer.h" -#include "Token.h" -#include "Utils.h" +#include <InfoEx.h> +#include <NetLayer.h> +#include <Panic.h> +#include <StarServer.h> +#include <Token.h> +#include <Utils.h> +#include <VersionInfo.h> int dump_missions = 0; @@ -19,7 +20,8 @@ int main(int argc, char * argv[]) { AssignErrLog(fopen("serverlog.txt", "wb")); - MachineInfo::DescribeMachine(); + Print("Starserver %s\n", versionInfo); + Print("%s\n\n", InfoEx::LongDescription().data()); int result = 1; try { NetLayer net; diff --git a/Starserver/NetAdminServer.cpp b/Starserver/NetAdminServer.cpp index 7e82801..190931b 100644 --- a/Starserver/NetAdminServer.cpp +++ b/Starserver/NetAdminServer.cpp @@ -25,7 +25,6 @@ #include "DataLoader.h" #include "FormatUtil.h" -#include "MachineInfo.h" #include "VersionInfo.h" // +-------------------------------------------------------------------+ |