diff --git a/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h index 5f9b393bde..8f07f61e60 100644 --- a/src/3rdparty/squirrel/squirrel/squtils.h +++ b/src/3rdparty/squirrel/squirrel/squtils.h @@ -2,7 +2,7 @@ #ifndef _SQUTILS_H_ #define _SQUTILS_H_ -#include "../../fmt/format.h" +#include "../../../core/format.hpp" #include "../../../script/script_fatalerror.hpp" #include diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 98e3d793f9..5af1c6150d 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -15,7 +15,7 @@ #include "../debug.h" #include "../string_func.h" #include "../rev.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include #include "../safeguards.h" diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index cbc4cc933c..2f6456f101 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -17,7 +17,7 @@ #include "../script/api/script_object.hpp" #include "ai_info.hpp" #include "ai_scanner.hpp" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h" diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp index 465392e698..5b9b67f0db 100644 --- a/src/game/game_scanner.cpp +++ b/src/game/game_scanner.cpp @@ -12,8 +12,7 @@ #include "../script/squirrel_class.hpp" #include "game_info.hpp" #include "game_scanner.hpp" - -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h" diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 6ac51b2adf..7362c1d5dd 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -21,7 +21,7 @@ #include "network.h" #include "network_client.h" #include "network_base.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../widgets/network_chat_widget.h" diff --git a/src/os/macosx/survey_osx.cpp b/src/os/macosx/survey_osx.cpp index 88edebd9f6..d553a81989 100644 --- a/src/os/macosx/survey_osx.cpp +++ b/src/os/macosx/survey_osx.cpp @@ -11,7 +11,7 @@ #include "../../stdafx.h" -#include "../../3rdparty/fmt/format.h" +#include "../../core/format.hpp" #include "macos.h" #include diff --git a/src/os/windows/survey_win.cpp b/src/os/windows/survey_win.cpp index 407ddb31d4..3bb7f7cde2 100644 --- a/src/os/windows/survey_win.cpp +++ b/src/os/windows/survey_win.cpp @@ -11,7 +11,7 @@ #include "../../stdafx.h" -#include "../../3rdparty/fmt/format.h" +#include "../../core/format.hpp" #include #include diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp index 832ea61b97..48b52bea9b 100644 --- a/src/script/api/script_admin.cpp +++ b/src/script/api/script_admin.cpp @@ -13,7 +13,7 @@ #include "../../network/network_admin.h" #include "../script_instance.hpp" #include "../../string_func.h" -#include "../../3rdparty/fmt/format.h" +#include "../../core/format.hpp" #include "../../safeguards.h" diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index da3a6422a3..da8b4fb9e8 100644 --- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -21,7 +21,7 @@ #include "../script_gui.h" #include "../../settings_type.h" #include "../../network/network.h" -#include "../../3rdparty/fmt/format.h" +#include "../../core/format.hpp" #include "../../safeguards.h" diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp index 21e0663f2a..058e6cf245 100644 --- a/src/script/api/script_text.cpp +++ b/src/script/api/script_text.cpp @@ -17,7 +17,7 @@ #include "../script_instance.hpp" #include "script_log.hpp" #include "../../table/control_codes.h" -#include "../../3rdparty/fmt/format.h" +#include "../../core/format.hpp" #include "table/strings.h" diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp index 2f9d1027b7..cb3478e5d2 100644 --- a/src/script/script_config.cpp +++ b/src/script/script_config.cpp @@ -14,7 +14,7 @@ #include "api/script_object.hpp" #include "../textfile_gui.h" #include "../string_func.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include #include "../safeguards.h" diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp index ec3c668fa6..d037af2e59 100644 --- a/src/script/script_info.cpp +++ b/src/script/script_info.cpp @@ -14,7 +14,7 @@ #include "script_info.hpp" #include "script_scanner.hpp" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h" diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp index 70447b4b97..4483751ac3 100644 --- a/src/script/script_info_dummy.cpp +++ b/src/script/script_info_dummy.cpp @@ -12,7 +12,7 @@ #include "../string_func.h" #include "../strings_func.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h" diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp index a0f6652966..c14d3e9f81 100644 --- a/src/script/script_instance.cpp +++ b/src/script/script_instance.cpp @@ -29,7 +29,7 @@ #include "../fileio_func.h" #include "../league_type.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h" diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp index 4c19a6cb71..257b42042b 100644 --- a/src/script/script_scanner.cpp +++ b/src/script/script_scanner.cpp @@ -20,7 +20,7 @@ #include "../network/network_content.h" #include "../3rdparty/md5/md5.h" #include "../tar_type.h" -#include "../3rdparty/fmt/format.h" +#include "../core/format.hpp" #include "../safeguards.h"