From 6d5cb2e637ac244273ec7da27aea085b27e257be Mon Sep 17 00:00:00 2001 From: Tobi-D7 Date: Tue, 12 Mar 2024 09:20:44 +0100 Subject: [PATCH] fall back to old msg --- source/helper.cpp | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/source/helper.cpp b/source/helper.cpp index 7e5bf57..a6b11be 100644 --- a/source/helper.cpp +++ b/source/helper.cpp @@ -298,14 +298,12 @@ bool C_CXX_Compile(bool cxx, std::string dir_, std::filesystem::path it, fix_path(it.stem().string()) + ".o " + Flags2Str((cxx ? prj.cxx_flags : prj.c_flags)) + " " + IncludeDirs(prj.include_dirs) + " " + LibIncludes(prj.lib_dirs); - // std::cout << CCMAGENTA << "Compiling: " << CCCYAN << - // fix_path(it.filename().string()) - // << std::endl; + std::cout << CCMAGENTA << "Compiling: " << CCCYAN + << fix_path(it.filename().string()) << std::endl; int reqres = system(command.c_str()); - // std::cout << (reqres == 0 ? CCGREEN : CCRED) - // << (reqres == 0 ? "[+] " : "[-] ") << - // fix_path(it.filename().string()) - // << std::endl; + std::cout << (reqres == 0 ? CCGREEN : CCRED) + << (reqres == 0 ? "[+] " : "[-] ") + << fix_path(it.filename().string()) << std::endl; return reqres != 0; } @@ -315,12 +313,10 @@ bool Picasso_Compile(std::string dir_, std::string dkp_env, dir_ + "/build/" + fix_path(it.stem().stem().string()) + ".shbin "; std::string command = dkp_env + "/tools/bin/picasso -o " + res_f + fix_path(it.string()); - // std::cout << CCMAGENTA << "Generating: " << CCCYAN << res_f - // << std::endl; + std::cout << CCMAGENTA << "Generating: " << CCCYAN << res_f << std::endl; int reqres = system(command.c_str()); - // std::cout << (reqres == 0 ? CCGREEN : CCRED) - // << (reqres == 0 ? "[+] " : "[-] ") << res_f - // << std::endl; + std::cout << (reqres == 0 ? CCGREEN : CCRED) + << (reqres == 0 ? "[+] " : "[-] ") << res_f << std::endl; if (reqres != 0) return true; // Bin2o action // Mod res_f @@ -351,14 +347,12 @@ bool Tex3ds_Compile(std::string dir_, std::string dkp_env, dir_ + "/build/" + fix_path(it.stem().string()) + ".h" + " -d " + dir_ + "/build/" + fix_path(it.stem().string()) + ".d" + " -o " + dir_ + "/romfs/gfx//" + fix_path(it.stem().string()) + ".t3x"; - // std::cout << CCMAGENTA << "Generating: " << CCCYAN << - // fix_path(it.filename().string()) - // << std::endl; + std::cout << CCMAGENTA << "Generating: " << CCCYAN + << fix_path(it.filename().string()) << std::endl; int reqres = system(command.c_str()); - // std::cout << (reqres == 0 ? CCGREEN : CCRED) - // << (reqres == 0 ? "[+] " : "[-] ") << - // fix_path(it.filename().string()) - // << std::endl; + std::cout << (reqres == 0 ? CCGREEN : CCRED) + << (reqres == 0 ? "[+] " : "[-] ") + << fix_path(it.filename().string()) << std::endl; return reqres != 0; } @@ -461,13 +455,11 @@ void CompileProject(NpiProject &prj, std::string dir_, bool async = true) { for (auto const &it : t3s_files_) { prgc++; - updateProgressBar(((float)prgc / (float)wa), it.filename().string()); Tex3ds_Compile(dir_, dkp_env, it, prj); } for (auto const &it : v_pica_files_) { prgc++; - updateProgressBar(((float)prgc / (float)wa), it.filename().string()); Picasso_Compile(dir_, dkp_env, it, prj); } @@ -479,13 +471,11 @@ void CompileProject(NpiProject &prj, std::string dir_, bool async = true) { {*/ for (auto const &it : cpp_files_) { prgc++; - updateProgressBar(((float)prgc / (float)wa), it.filename().string()); C_CXX_Compile(true, dir_, it, prj); } for (auto const &it : c_files_) { prgc++; - updateProgressBar(((float)prgc / (float)wa), it.filename().string()); C_CXX_Compile(false, dir_, it, prj); } //}