tobid7/npi-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fall back to old msg

Browse Source
This commit is contained in:
Tobi-D7 2024-03-12 09:20:44 +01:00
parent b8e861d9b4
commit 6d5cb2e637
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/helper.cpp
View File

@ -298,14 +298,12 @@ bool C_CXX_Compile(bool cxx, std::string dir_, std::filesystem::path it,
fix_path(it.stem().string()) + ".o " + fix_path(it.stem().string()) + ".o " +
Flags2Str((cxx ? prj.cxx_flags : prj.c_flags)) + " " + Flags2Str((cxx ? prj.cxx_flags : prj.c_flags)) + " " +
IncludeDirs(prj.include_dirs) + " " + LibIncludes(prj.lib_dirs); IncludeDirs(prj.include_dirs) + " " + LibIncludes(prj.lib_dirs);
// std::cout << CCMAGENTA << "Compiling: " << CCCYAN << std::cout << CCMAGENTA << "Compiling: " << CCCYAN
// fix_path(it.filename().string()) << fix_path(it.filename().string()) << std::endl;
// << std::endl;
int reqres = system(command.c_str()); int reqres = system(command.c_str());
// std::cout << (reqres == 0 ? CCGREEN : CCRED) std::cout << (reqres == 0 ? CCGREEN : CCRED)
// << (reqres == 0 ? "[+] " : "[-] ") << << (reqres == 0 ? "[+] " : "[-] ")
// fix_path(it.filename().string()) << fix_path(it.filename().string()) << std::endl;
// << std::endl;
return reqres != 0; 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 "; dir_ + "/build/" + fix_path(it.stem().stem().string()) + ".shbin ";
std::string command = std::string command =
dkp_env + "/tools/bin/picasso -o " + res_f + fix_path(it.string()); dkp_env + "/tools/bin/picasso -o " + res_f + fix_path(it.string());
// std::cout << CCMAGENTA << "Generating: " << CCCYAN << res_f std::cout << CCMAGENTA << "Generating: " << CCCYAN << res_f << std::endl;
// << std::endl;
int reqres = system(command.c_str()); int reqres = system(command.c_str());
// std::cout << (reqres == 0 ? CCGREEN : CCRED) std::cout << (reqres == 0 ? CCGREEN : CCRED)
// << (reqres == 0 ? "[+] " : "[-] ") << res_f << (reqres == 0 ? "[+] " : "[-] ") << res_f << std::endl;
// << std::endl;
if (reqres != 0) return true; if (reqres != 0) return true;
// Bin2o action // Bin2o action
// Mod res_f // 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_ + dir_ + "/build/" + fix_path(it.stem().string()) + ".h" + " -d " + dir_ +
"/build/" + fix_path(it.stem().string()) + ".d" + " -o " + dir_ + "/build/" + fix_path(it.stem().string()) + ".d" + " -o " + dir_ +
"/romfs/gfx//" + fix_path(it.stem().string()) + ".t3x"; "/romfs/gfx//" + fix_path(it.stem().string()) + ".t3x";
// std::cout << CCMAGENTA << "Generating: " << CCCYAN << std::cout << CCMAGENTA << "Generating: " << CCCYAN
// fix_path(it.filename().string()) << fix_path(it.filename().string()) << std::endl;
// << std::endl;
int reqres = system(command.c_str()); int reqres = system(command.c_str());
// std::cout << (reqres == 0 ? CCGREEN : CCRED) std::cout << (reqres == 0 ? CCGREEN : CCRED)
// << (reqres == 0 ? "[+] " : "[-] ") << << (reqres == 0 ? "[+] " : "[-] ")
// fix_path(it.filename().string()) << fix_path(it.filename().string()) << std::endl;
// << std::endl;
return reqres != 0; return reqres != 0;
} }
@ -461,13 +455,11 @@ void CompileProject(NpiProject &prj, std::string dir_, bool async = true) {
for (auto const &it : t3s_files_) { for (auto const &it : t3s_files_) {
prgc++; prgc++;
updateProgressBar(((float)prgc / (float)wa), it.filename().string());
Tex3ds_Compile(dir_, dkp_env, it, prj); Tex3ds_Compile(dir_, dkp_env, it, prj);
} }
for (auto const &it : v_pica_files_) { for (auto const &it : v_pica_files_) {
prgc++; prgc++;
updateProgressBar(((float)prgc / (float)wa), it.filename().string());
Picasso_Compile(dir_, dkp_env, it, prj); 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_) { for (auto const &it : cpp_files_) {
prgc++; prgc++;
updateProgressBar(((float)prgc / (float)wa), it.filename().string());
C_CXX_Compile(true, dir_, it, prj); C_CXX_Compile(true, dir_, it, prj);
} }
for (auto const &it : c_files_) { for (auto const &it : c_files_) {
prgc++; prgc++;
updateProgressBar(((float)prgc / (float)wa), it.filename().string());
C_CXX_Compile(false, dir_, it, prj); C_CXX_Compile(false, dir_, it, prj);
} }
//} //}