From d77cdd0427546d56882dde6e24962d2266a588ac Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Sun, 3 Jul 2022 21:41:24 +0300 Subject: [PATCH] fix compiling on ubuntu --- src/CMakeLists.txt | 1 + src/iologindata.cpp | 5 +++++ src/iomarket.cpp | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8cdbf0..0709f3a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,6 +29,7 @@ set(tfs_SRC ${CMAKE_CURRENT_LIST_DIR}/ioguild.cpp ${CMAKE_CURRENT_LIST_DIR}/iologindata.cpp ${CMAKE_CURRENT_LIST_DIR}/iomap.cpp + ${CMAKE_CURRENT_LIST_DIR}/iomarket.cpp ${CMAKE_CURRENT_LIST_DIR}/iomapserialize.cpp ${CMAKE_CURRENT_LIST_DIR}/item.cpp ${CMAKE_CURRENT_LIST_DIR}/items.cpp diff --git a/src/iologindata.cpp b/src/iologindata.cpp index 602dcfb..e742643 100644 --- a/src/iologindata.cpp +++ b/src/iologindata.cpp @@ -22,7 +22,12 @@ #include "iologindata.h" #include "configmanager.h" #include "game.h" + +#if __has_include("fmt/core.h") #include +#else +#include +#endif extern ConfigManager g_config; extern Game g_game; diff --git a/src/iomarket.cpp b/src/iomarket.cpp index 4476538..3cb078e 100644 --- a/src/iomarket.cpp +++ b/src/iomarket.cpp @@ -10,7 +10,11 @@ #include "game.h" #include "iologindata.h" #include "scheduler.h" +#if __has_include("fmt/core.h") #include +#else +#include +#endif extern ConfigManager g_config; extern Game g_game;