compile fixes and default client_location (#809)

* support for gcc9 on ubuntu 18.04 This is needed to make filesystem work * fix default for client location
DarkflameUniverse · Nov 3, 2022 · 353c328 · 353c328
1 parent 4a6f3e4
commit 353c328
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ if(UNIX)
 	if(APPLE)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
 	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC -lstdc++fs")
 	endif()
 	if (__dynamic AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")

diff --git a/dChatServer/ChatServer.cpp b/dChatServer/ChatServer.cpp
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
 	try {
 		std::string client_path = config.GetValue("client_location");
 		if (client_path.empty()) client_path = "./res";
-		Game::assetManager = new AssetManager(config.GetValue("client_location"));
+		Game::assetManager = new AssetManager(client_path);
 	} catch (std::runtime_error& ex) {
 		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
 

diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp
@@ -104,7 +104,7 @@ int main(int argc, char** argv) {
 	try {
 		std::string client_path = config.GetValue("client_location");
 		if (client_path.empty()) client_path = "./res";
-		Game::assetManager = new AssetManager(config.GetValue("client_location"));
+		Game::assetManager = new AssetManager(client_path);
 	} catch (std::runtime_error& ex) {
 		Game::logger->Log("MasterServer", "Got an error while setting up assets: %s", ex.what());
 

diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
@@ -148,7 +148,7 @@ int main(int argc, char** argv) {
 	try {
 		std::string client_path = config.GetValue("client_location");
 		if (client_path.empty()) client_path = "./res";
-		Game::assetManager = new AssetManager(config.GetValue("client_location"));
+		Game::assetManager = new AssetManager(client_path);
 	} catch (std::runtime_error& ex) {
 		Game::logger->Log("WorldServer", "Got an error while setting up assets: %s", ex.what());