incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to C++20; update for phosg JSON changes

Browse Source
This commit is contained in:
Martin Michelsen
2021-11-06 23:53:53 -07:00
parent 88f0dca887
commit a3ad0f76cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Main.cc
+1 -1
View File
@@ -239,7 +239,7 @@ int main(int argc, char* argv[]) {
} }
log(INFO, "loading configuration"); log(INFO, "loading configuration");
auto config_json = JSONObject::load("system/config.json"); auto config_json = JSONObject::parse(load_file("system/config.json"));
populate_state_from_config(state, config_json); populate_state_from_config(state, config_json);
shared_ptr<DNSServer> dns_server; shared_ptr<DNSServer> dns_server;
Makefile
+2 -2
View File
@@ -4,8 +4,8 @@ OBJECTS=FileContentsCache.o Menu.o PSOProtocol.o Client.o Lobby.o \
LevelTable.o Compression.o Quest.o RareItemSet.o Map.o NetworkAddresses.o \ LevelTable.o Compression.o Quest.o RareItemSet.o Map.o NetworkAddresses.o \
Text.o DNSServer.o ProxyServer.o Shell.o ServerShell.o ProxyShell.o Main.o Text.o DNSServer.o ProxyServer.o Shell.o ServerShell.o ProxyShell.o Main.o
CXX=g++ CXX=g++
CXXFLAGS=-I/opt/local/include -I/usr/local/include -std=c++14 -g -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H -Wall -Werror CXXFLAGS=-I/opt/local/include -I/usr/local/include -std=c++20 -g -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H -Wall -Werror
LDFLAGS=-L/opt/local/lib -L/usr/local/lib -std=c++14 -levent -levent_pthreads -lphosg -lpthread LDFLAGS=-L/opt/local/lib -L/usr/local/lib -std=c++20 -levent -levent_pthreads -lphosg -lpthread
all: newserv all: newserv