This commit is contained in:
parent
fa6c8a7fea
commit
ff907e79cf
2 changed files with 0 additions and 11 deletions
|
|
@ -299,7 +299,6 @@ namespace Crafter {
|
||||||
BuildWasmStdPcm(project, config);
|
BuildWasmStdPcm(project, config);
|
||||||
} else {
|
} else {
|
||||||
std::cout << config.target << std::endl;
|
std::cout << config.target << std::endl;
|
||||||
std::cout << "x86_64-pc-windows-msvc" << std::endl;
|
|
||||||
throw std::runtime_error(std::format("Unkown target: {}", config.target));
|
throw std::runtime_error(std::format("Unkown target: {}", config.target));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -240,9 +240,7 @@ namespace Crafter {
|
||||||
|
|
||||||
fs::path exeDir = GetPath();
|
fs::path exeDir = GetPath();
|
||||||
|
|
||||||
std::cout << "before pcm" << std::endl;
|
|
||||||
BuildStdPcm(*this, config);
|
BuildStdPcm(*this, config);
|
||||||
std::cout << "after pcm" << std::endl;
|
|
||||||
|
|
||||||
std::string editedTarget = config.target;
|
std::string editedTarget = config.target;
|
||||||
std::replace(editedTarget.begin(), editedTarget.end(), '-', '_');
|
std::replace(editedTarget.begin(), editedTarget.end(), '-', '_');
|
||||||
|
|
@ -333,8 +331,6 @@ namespace Crafter {
|
||||||
|
|
||||||
std::vector<std::string> resultsDep(config.dependencies.size());
|
std::vector<std::string> resultsDep(config.dependencies.size());
|
||||||
|
|
||||||
std::cout << "bruh 5" << std::endl;
|
|
||||||
|
|
||||||
for(std::uint_fast32_t i = 0; i < depThreads.size(); i++) {
|
for(std::uint_fast32_t i = 0; i < depThreads.size(); i++) {
|
||||||
depThreads[i] = std::thread([i, &config, &libMutex, &depLibSet, &buildDir, &pcmDir, &libsString, &binDir, this, &buildResult, &resultsDep](){
|
depThreads[i] = std::thread([i, &config, &libMutex, &depLibSet, &buildDir, &pcmDir, &libsString, &binDir, this, &buildResult, &resultsDep](){
|
||||||
for(Configuration& config2 : std::get<0>(config.dependencies[i])->configurations) {
|
for(Configuration& config2 : std::get<0>(config.dependencies[i])->configurations) {
|
||||||
|
|
@ -370,8 +366,6 @@ namespace Crafter {
|
||||||
return buildResult;
|
return buildResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "bruh 7" << std::endl;
|
|
||||||
|
|
||||||
|
|
||||||
for(const fs::path& cFile: config.c_files) {
|
for(const fs::path& cFile: config.c_files) {
|
||||||
files+=std::format(" {}_source.o ",(buildDir/cFile.filename()).string());
|
files+=std::format(" {}_source.o ",(buildDir/cFile.filename()).string());
|
||||||
|
|
@ -425,15 +419,11 @@ namespace Crafter {
|
||||||
buildResult.errors += result2;
|
buildResult.errors += result2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!buildResult.errors.empty()) {
|
if(!buildResult.errors.empty()) {
|
||||||
fileThread.join();
|
fileThread.join();
|
||||||
return buildResult;
|
return buildResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "bruh 8" << std::endl;
|
|
||||||
|
|
||||||
|
|
||||||
if(config.target != "wasm32-wasi") {
|
if(config.target != "wasm32-wasi") {
|
||||||
command += " -L/usr/local/lib";
|
command += " -L/usr/local/lib";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue