iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of fmt dependency since we are on C++23

Browse Source
This commit is contained in:
irisz64
2025-07-22 11:30:37 +02:00
parent 9b169825ee
commit 8549d5a21c
173 changed files with 452 additions and 83654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/CMakeLists.txt
View File

@@ -31,7 +31,6 @@ include_directories(
../../external/discord_rpc/include
../../external/xbyak
../../external/mio/include
../../external/fmt/include
../../external/json/include
../../external/parallel-rdp
../../external/parallel-rdp
@@ -102,7 +101,6 @@ if (${CMAKE_BUILD_TYPE} MATCHES Debug)
endif ()
add_subdirectory(../../external/discord_rpc discord_rpc)
add_subdirectory(../../external/fmt fmt)
add_subdirectory(../../external/mio mio)
add_subdirectory(../backend backend)
add_subdirectory(../../external/parallel-rdp parallel-rdp)
@@ -136,7 +134,7 @@ add_executable(kaizen
Debugger.hpp
Debugger.cpp)
target_link_libraries(kaizen PUBLIC imgui nfd SDL3::SDL3 SDL3::SDL3-static cflags::cflags discord-rpc fmt mio parallel-rdp capstone backend)
target_link_libraries(kaizen PUBLIC imgui nfd SDL3::SDL3 SDL3::SDL3-static cflags::cflags discord-rpc mio parallel-rdp capstone backend)
target_compile_definitions(kaizen PUBLIC SDL_MAIN_HANDLED)
file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)

4
src/frontend/ImGuiImpl/GUI.hpp
View File

@@ -24,7 +24,7 @@ namespace gui {
static void CheckVkResult(VkResult err) {
if (err == 0)
return;
Util::error("[vulkan] VkResult = {}", (int) err);
error("[vulkan] VkResult = {}", (int) err);
if (err < 0)
abort();
}
@@ -140,7 +140,7 @@ namespace gui {
}, g_Instance);
if(!ImGui_ImplVulkan_Init(&init_info))
Util::panic("Failed to initialize ImGui!");
panic("Failed to initialize ImGui!");
}
inline void StartFrame() {

6
src/frontend/KaizenGui.cpp
View File

@@ -24,7 +24,7 @@ void KaizenGui::QueryDevices(SDL_Event event) {
const auto index = event.gdevice.which;
gamepad = SDL_OpenGamepad(index);
Util::info("Found controller!");
info("Found controller!");
}
break;
case SDL_EVENT_GAMEPAD_REMOVED:
@@ -43,7 +43,7 @@ void KaizenGui::FileDialog() {
auto result = NFD::OpenDialog(path, filterItems.data(), filterItems.size());
if(result == NFD_ERROR)
Util::panic("Error: {}", NFD::GetError());
panic("Error: {}", NFD::GetError());
if(result != NFD_CANCEL) {
LoadROM(path.get());
@@ -277,5 +277,5 @@ void KaizenGui::LoadTAS(const std::string &path) const noexcept {
return;
}
Util::panic("Could not load TAS movie {}!", path);
panic("Could not load TAS movie {}!", path);
}

2
src/frontend/NativeWindow.hpp
View File

@@ -12,7 +12,7 @@ struct NativeWindow {
window = SDL_CreateWindow(title.c_str(), w, h, SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
if(volkInitialize() != VK_SUCCESS) {
Util::panic("Failed to initialize Volk!");
panic("Failed to initialize Volk!");
}
}

3
src/frontend/SettingsWindow.cpp
View File

@@ -1,5 +1,4 @@
#include <SettingsWindow.hpp>
#include <fmt/core.h>
#include <nfd.hpp>
#include <log.hpp>
#include <Options.hpp>
@@ -20,7 +19,7 @@ bool SettingsWindow::render() {
auto result = NFD::PickFolder(outPath);
if(result == NFD_ERROR)
Util::panic("Error: {}", NFD::GetError());
panic("Error: {}", NFD::GetError());
if(result != NFD_CANCEL) {
savesPath = outPath.get();