Catcrafts/Crafter.Build
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windows build fix
Some checks failed
demo.yaml / windows build fix (push) Failing after 0s
Details

Browse source
This commit is contained in:
Jorijn van der Graaf 2026-03-03 00:06:00 +01:00
commit 898e3f8a16
2 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
implementations/Crafter.Build-Configuration.cpp
View file

@ -313,12 +313,8 @@ namespace Crafter {
} }
} }
std::cout << "10" << std::endl;
std::string configName = it["configuration"].get<std::string>(); std::string configName = it["configuration"].get<std::string>();
std::cout << "11" << std::endl;
// Create a Project object for the dependency // Create a Project object for the dependency
std::unique_ptr<Project> depProject = std::make_unique<Project>(std::move(path), configName); std::unique_ptr<Project> depProject = std::make_unique<Project>(std::move(path), configName);

13
implementations/Crafter.Build-Project.cpp
View file

@ -164,7 +164,6 @@ namespace Crafter {
} }
BuildResult Project::Build(Configuration& config, const fs::path& binDir, const fs::path& outputDir, const fs::path& buildDir, std::string outputName) const { BuildResult Project::Build(Configuration& config, const fs::path& binDir, const fs::path& outputDir, const fs::path& buildDir, std::string outputName) const {
std::cout << "9" << std::endl;
BuildResult buildResult; BuildResult buildResult;
if (!fs::exists(binDir)) { if (!fs::exists(binDir)) {
fs::create_directories(binDir); fs::create_directories(binDir);
@ -178,8 +177,6 @@ namespace Crafter {
fs::create_directories(buildDir); fs::create_directories(buildDir);
} }
std::cout << "8" << std::endl;
std::vector<std::thread> threads; std::vector<std::thread> threads;
for(const Shader& shader : config.shaders) { for(const Shader& shader : config.shaders) {
if(!shader.Check(outputDir)) { if(!shader.Check(outputDir)) {
@ -187,8 +184,6 @@ namespace Crafter {
} }
} }
std::cout << "0" << std::endl;
std::thread fileThread([&config, &outputDir](){ std::thread fileThread([&config, &outputDir](){
for (const fs::path& additionalFile : config.additionalFiles) { for (const fs::path& additionalFile : config.additionalFiles) {
fs::path destination = outputDir / additionalFile.filename(); fs::path destination = outputDir / additionalFile.filename();
@ -235,9 +230,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(), '-', '_');
@ -250,8 +243,6 @@ namespace Crafter {
std::string command = std::format("clang++ -nostdinc++ -nostdlib++ -isystem %LIBCXX_DIR%\\include\\c++\\v1 --target={} -march={} -mtune={} -std={} -D CRAFTER_BUILD_CONFIGURATION_TARGET_{} -fprebuilt-module-path={}", config.target, config.march, config.march, config.standard, editedTarget, (exeDir/config.target).string()); std::string command = std::format("clang++ -nostdinc++ -nostdlib++ -isystem %LIBCXX_DIR%\\include\\c++\\v1 --target={} -march={} -mtune={} -std={} -D CRAFTER_BUILD_CONFIGURATION_TARGET_{} -fprebuilt-module-path={}", config.target, config.march, config.march, config.standard, editedTarget, (exeDir/config.target).string());
#endif #endif
std::cout << "2" << std::endl;
for (const auto& entry : fs::recursive_directory_iterator(buildDir)) { for (const auto& entry : fs::recursive_directory_iterator(buildDir)) {
if (entry.is_directory() && entry.path().filename() == "include") { if (entry.is_directory() && entry.path().filename() == "include") {
command += " -I" + entry.path().string() + " "; command += " -I" + entry.path().string() + " ";
@ -265,7 +256,6 @@ namespace Crafter {
} }
std::cout << "4" << std::endl;
for (const auto& entry : fs::directory_iterator(buildDir)) { for (const auto& entry : fs::directory_iterator(buildDir)) {
if (entry.is_directory()) { if (entry.is_directory()) {
command += " -I" + entry.path().string() + " "; command += " -I" + entry.path().string() + " ";
@ -278,7 +268,6 @@ namespace Crafter {
} }
} }
std::cout << "3" << std::endl;
if(config.target == "wasm32-wasi") { if(config.target == "wasm32-wasi") {
command += std::format(" --sysroot={} -fno-exceptions -fno-c++-static-destructors", (exeDir/"wasi-sysroot-28.0").string()); command += std::format(" --sysroot={} -fno-exceptions -fno-c++-static-destructors", (exeDir/"wasi-sysroot-28.0").string());
@ -332,8 +321,6 @@ namespace Crafter {
command += std::format(" -I{}", dir); command += std::format(" -I{}", dir);
} }
std::cout << "5" << std::endl;
std::unordered_set<std::string> depLibSet; std::unordered_set<std::string> depLibSet;
std::vector<std::thread> depThreads = std::vector<std::thread>(config.dependencies.size()); std::vector<std::thread> depThreads = std::vector<std::thread>(config.dependencies.size());
std::mutex libMutex; std::mutex libMutex;