chore: remove fmt usage (#54)

ongoing work to remove fmt usage in the project needs to be tested in cmake and vcpkg
Starfield-Reverse-Engineering · Sep 15, 2023 · a381cb6 · a381cb6
1 parent faf5067
commit a381cb6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/CommonLibSF/include/RE/F/FormTypes.h b/CommonLibSF/include/RE/F/FormTypes.h
@@ -235,6 +235,7 @@ namespace std
 	}
 }
 
+#ifdef FMT_VERSION
 namespace fmt
 {
 	template <>
@@ -253,6 +254,7 @@ namespace fmt
 		}
 	};
 }
+#endif
 
 #ifdef __cpp_lib_format
 namespace std

diff --git a/CommonLibSF/include/SFSE/Impl/PCH.h b/CommonLibSF/include/SFSE/Impl/PCH.h
@@ -56,7 +56,9 @@
 static_assert(std::is_integral_v<std::time_t> && sizeof(std::time_t) == sizeof(std::size_t), "wrap std::time_t instead");
 
 #pragma warning(push)
-#include <fmt/format.h>
+#ifndef SPDLOG_USE_STD_FORMAT
+	#define SPDLOG_USE_STD_FORMAT
+#endif
 #include <spdlog/spdlog.h>
 #pragma warning(pop)
 
@@ -69,7 +71,7 @@ static_assert(std::is_integral_v<std::time_t> && sizeof(std::time_t) == sizeof(s
 #define stl_assert(cond, ...)                                     \
 	{                                                             \
 		if (!((cond))) {                                          \
-			SFSE::stl::report_and_fail(fmt::format(__VA_ARGS__)); \
+			SFSE::stl::report_and_fail(std::format(__VA_ARGS__)); \
 		}                                                         \
 	}
 
@@ -574,7 +576,7 @@ namespace SFSE
 					filename = matches[1].str();
 				}
 
-				return utf8_to_utf16(fmt::format("{}({}): {}"sv, filename, a_loc.line(), a_msg)).value_or(L"<character encoding error>"s);
+				return utf8_to_utf16(std::format("{}({}): {}"sv, filename, a_loc.line(), a_msg)).value_or(L"<character encoding error>"s);
 			}();
 
 			const auto caption = []() {

diff --git a/CommonLibSF/include/SFSE/Logger.h b/CommonLibSF/include/SFSE/Logger.h
@@ -7,11 +7,11 @@
 	{                                                                                                                                                                                                                                                                                                                    \
 		a_func() = delete;                                                                                                                                                                                                                                                                                               \
                                                                                                                                                                                                                                                                                                                          \
-		explicit a_func(fmt::format_string<Args...> a_fmt, Args&&... a_args, std::source_location a_loc = std::source_location::current()) { spdlog::log(spdlog::source_loc{ a_loc.file_name(), static_cast<int>(a_loc.line()), a_loc.function_name() }, spdlog::level::a_type, a_fmt, std::forward<Args>(a_args)...); } \
+		explicit a_func(std::format_string<Args...> a_fmt, Args&&... a_args, std::source_location a_loc = std::source_location::current()) { spdlog::log(spdlog::source_loc{ a_loc.file_name(), static_cast<int>(a_loc.line()), a_loc.function_name() }, spdlog::level::a_type, a_fmt, std::forward<Args>(a_args)...); } \
 	};                                                                                                                                                                                                                                                                                                                   \
                                                                                                                                                                                                                                                                                                                          \
 	template <class... Args>                                                                                                                                                                                                                                                                                             \
-	a_func(fmt::format_string<Args...>, Args&&...) -> a_func<Args...>;
+	a_func(std::format_string<Args...>, Args&&...) -> a_func<Args...>;
 
 namespace SFSE::log
 {

diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json
@@ -16,7 +16,6 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
-    "fmt",
     "spdlog",
     "xbyak"
   ]

diff --git a/CommonLibSF/xmake.lua b/CommonLibSF/xmake.lua
@@ -8,7 +8,7 @@ target("commonlibsf")
     set_kind("static")
 
     -- add packages
-    add_packages("fmt", "spdlog", { public = true })
+    add_packages("spdlog", { public = true })
 
     if has_config("sfse_xbyak") then
         add_packages("xbyak")

diff --git a/xmake.lua b/xmake.lua
@@ -12,8 +12,8 @@ set_encodings("utf-8")
 add_rules("mode.debug", "mode.release")
 
 -- require packages
-add_requires("fmt", "xbyak")
-add_requires("spdlog", { configs = { header_only = false, fmt_external = true } })
+add_requires("xbyak")
+add_requires("spdlog", { configs = { header_only = false, std_format = true } })
 
 -- include subprojects
 includes("CommonLibSF")
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
           "name": "vcpkg-cmake-config",
           "host": true
         },
-        "fmt",
         "spdlog",
         "xbyak"
       ]
@@ Expand Down @@