Remove dependency on libfmt

Author: Crayon2000

CHANGELOG.md

@@ -4,8 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+- Remove dependency on libfmt
 - Library update
-  - fmt 11.2.0
   - GRRMOD (670f84601a5086c4d3eeb03bd3041e3c0a7f0ace)
   - GRRLIB (c3f2acfee7a4a93e35ade02408daa1508c9309f5)
 

CMakeLists.txt

@@ -17,21 +17,17 @@ pkg_check_modules(FREETYPE REQUIRED freetype2)
 pkg_check_modules(MXML REQUIRED mxml)
 
 include(FetchContent)
-FetchContent_Declare(fmt
-  URL https://github.com/fmtlib/fmt/archive/refs/tags/11.2.0.tar.gz
-)
 FetchContent_Declare(grrlib
   GIT_REPOSITORY https://github.com/GRRLIB/GRRLIB.git
   GIT_TAG        c3f2acfee7a4a93e35ade02408daa1508c9309f5
 )
 FetchContent_Declare(grrmod
   URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/670f84601a5086c4d3eeb03bd3041e3c0a7f0ace
 )
-set(FMT_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRLIB_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRMOD_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRMOD_USE_MP3 OFF CACHE BOOL "Don't use MP3" FORCE)
-FetchContent_MakeAvailable(fmt grrlib grrmod)
+FetchContent_MakeAvailable(grrlib grrmod)
 
 file(GLOB_RECURSE SRC_FILES
   "${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp"
@@ -70,7 +66,6 @@ dkp_add_embedded_binary_library(data
 
 target_link_libraries(Wii-Tac-Toe PRIVATE
   data
-  fmt::fmt
   grrlib
   grrmod
   ${PNG_LIBRARIES}

source/game.cpp

@@ -1,15 +1,15 @@
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
+#include <chrono>
 #include <charconv>
 #include <limits>
+#include <format>
 #include <wiiuse/wpad.h>
 #include <ogc/conf.h>
 #include <ogc/lwp_watchdog.h>
 #include "grrlib.h"
 #include "grrlib_class.h"
-#include "fmt/format.h"
-#include "fmt/chrono.h"
 #include "tools.h"
 #include "grid.h"
 #include "audio.h"
@@ -138,10 +138,10 @@ Game::Game(u16 GameScreenWidth, u16 GameScreenHeight) :
     // Build Start Screen background
     SplashImg->Draw(0, 0);
     GRRLIB_PrintfTTF(50, 310, DefaultFont,
-        fmt::format(fmt::runtime(Lang->String("Programmer: {}")), "Crayon").c_str(),
+        std::format(std::runtime_format(Lang->String("Programmer: {}")), "Crayon").c_str(),
         11, 0xFFFFFFFF);
     GRRLIB_PrintfTTF(50, 330, DefaultFont,
-        fmt::format(fmt::runtime(Lang->String("Graphics: {}")), "Mr_Nick666").c_str(),
+        std::format(std::runtime_format(Lang->String("Graphics: {}")), "Mr_Nick666").c_str(),
         11, 0xFFFFFFFF);
     text = Lang->String("Press The A Button");
     GRRLIB_PrintfTTF((ScreenWidth / 2) - (GRRLIB_WidthTTF(DefaultFont, text.c_str(), 20) / 2),
@@ -232,7 +232,7 @@ void Game::Paint()
     if(ShowFPS == true)
     {
         CalculateFrameRate();
-        const auto strFPS = fmt::format("FPS: {}", FPS);
+        const auto strFPS = std::format("FPS: {}", FPS);
         GRRLIB_PrintfTTF(14, 444, DefaultFont, strFPS.c_str(), 17, 0xFFFFFFFF);
         GRRLIB_PrintfTTF(16, 446, DefaultFont, strFPS.c_str(), 17, 0x808080FF);
         GRRLIB_PrintfTTF(15, 445, DefaultFont, strFPS.c_str(), 17, 0x000000FF);
@@ -484,7 +484,7 @@ void Game::MenuScreen(bool CopyScreen)
         Rectangle(0, 385, ScreenWidth, 95, 0x000000FF, 1);
 
         GRRLIB_PrintfTTF(500, 40, DefaultFont,
-            fmt::format(fmt::runtime(Lang->String("Ver. {}")), "1.1.0").c_str(),
+            std::format(std::runtime_format(Lang->String("Ver. {}")), "1.1.0").c_str(),
             12, 0xFFFFFFFF);
 
         if(CopyScreen == true)
@@ -742,8 +742,8 @@ bool Game::ControllerManager()
         WPAD_Rumble(WPAD_CHAN_ALL, 1); // Rumble on
         WIILIGHT_TurnOn();
 
-        const std::time_t now = std::time(nullptr);
-        const auto path = fmt::format("sd:/Screenshot {:%F %H%M%S}.png", *std::localtime(&now));
+        const auto now = std::chrono::time_point_cast<std::chrono::seconds>(std::chrono::system_clock::now());
+        const auto path = std::format("sd:/Screenshot {:%F %H%M%S}.png", now);
 
         if(ScreenShot(path) == true)
         {
@@ -774,7 +774,7 @@ void Game::Clear()
     GameGrid->Clear();
     CurrentPlayer = PlayerToStart;
     PlayerToStart = !PlayerToStart; // Next other player will start
-    text = fmt::format(fmt::runtime(Lang->GetTurnOverMessage()), WTTPlayer[CurrentPlayer].GetName());
+    text = std::format(std::runtime_format(Lang->GetTurnOverMessage()), WTTPlayer[CurrentPlayer].GetName());
     RoundFinished = false;
     Copied = false;
     ChangeCursor();
@@ -790,7 +790,7 @@ void Game::TurnIsOver()
     {   // A winner is declare
         GameWinner = (GameWinner == WTTPlayer[0].GetSign()) ? 0 : 1;
         WTTPlayer[GameWinner].IncScore();
-        text = fmt::format(fmt::runtime(Lang->GetWinningMessage()),
+        text = std::format(std::runtime_format(Lang->GetWinningMessage()),
             WTTPlayer[GameWinner].GetName(), WTTPlayer[!GameWinner].GetName());
         RoundFinished = true;
         SymbolAlpha = 5;
@@ -805,7 +805,7 @@ void Game::TurnIsOver()
     else
     {
         CurrentPlayer = !CurrentPlayer; // Change player's turn
-        text = fmt::format(fmt::runtime(Lang->GetTurnOverMessage()), WTTPlayer[CurrentPlayer].GetName());
+        text = std::format(std::runtime_format(Lang->GetTurnOverMessage()), WTTPlayer[CurrentPlayer].GetName());
     }
 
     Copied = false;