summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2018-04-29 18:37:15 -0400
committerGravatar Lioncash2018-04-29 18:52:33 -0400
commit3abba08080c88c49359e91ab2688c23fa066110a (patch)
treec354d58817e230cc2ba1306e449628ef8dafeb3d /src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
parentMerge pull request #421 from Subv/sh_pred3 (diff)
downloadyuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.gz
yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.xz
yuzu-3abba08080c88c49359e91ab2688c23fa066110a.zip
string_util: Remove StringFromFormat() and related functions
Given we utilize fmt, we don't need to provide our own functions for formatting anymore
Diffstat (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.cpp')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index b6ed0c498..e21de6f21 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -7,6 +7,7 @@
7#include <string> 7#include <string>
8#define SDL_MAIN_HANDLED 8#define SDL_MAIN_HANDLED
9#include <SDL.h> 9#include <SDL.h>
10#include <fmt/format.h>
10#include <glad/glad.h> 11#include <glad/glad.h>
11#include "common/logging/log.h" 12#include "common/logging/log.h"
12#include "common/scm_rev.h" 13#include "common/scm_rev.h"
@@ -97,8 +98,8 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
97 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); 98 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
98 SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); 99 SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0);
99 100
100 std::string window_title = Common::StringFromFormat("yuzu %s| %s-%s ", Common::g_build_name, 101 std::string window_title = fmt::format("yuzu {} | {}-{}", Common::g_build_name,
101 Common::g_scm_branch, Common::g_scm_desc); 102 Common::g_scm_branch, Common::g_scm_desc);
102 render_window = 103 render_window =
103 SDL_CreateWindow(window_title.c_str(), 104 SDL_CreateWindow(window_title.c_str(),
104 SDL_WINDOWPOS_UNDEFINED, // x position 105 SDL_WINDOWPOS_UNDEFINED, // x position