diff --git a/implementations/Crafter.Build-Configuration.cpp b/implementations/Crafter.Build-Configuration.cpp index 9fb1d5d..c24e3ce 100644 --- a/implementations/Crafter.Build-Configuration.cpp +++ b/implementations/Crafter.Build-Configuration.cpp @@ -74,7 +74,6 @@ namespace Crafter { target = RunCommand("clang -print-target-triple"); #endif #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32) - AutoDetect(); target = "x86_64-pc-windows-msvc"; //target = RunCommand(std::format("{} && clang-cl.exe -print-target-triple", vsVars)); #endif diff --git a/implementations/Crafter.Build-Project.cpp b/implementations/Crafter.Build-Project.cpp index 608fa01..0399143 100644 --- a/implementations/Crafter.Build-Project.cpp +++ b/implementations/Crafter.Build-Project.cpp @@ -240,7 +240,9 @@ namespace Crafter { fs::path exeDir = GetPath(); + std::cout << "before pcm" << std::endl; BuildStdPcm(*this, config); + std::cout << "after pcm" << std::endl; std::string editedTarget = config.target; std::replace(editedTarget.begin(), editedTarget.end(), '-', '_'); @@ -331,6 +333,8 @@ namespace Crafter { std::vector resultsDep(config.dependencies.size()); + std::cout << "bruh 5" << std::endl; + 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](){ for(Configuration& config2 : std::get<0>(config.dependencies[i])->configurations) { @@ -366,6 +370,9 @@ namespace Crafter { return buildResult; } + std::cout << "bruh 7" << std::endl; + + for(const fs::path& cFile: config.c_files) { files+=std::format(" {}_source.o ",(buildDir/cFile.filename()).string()); if(!fs::exists((buildDir/cFile.filename()).string()+"_source.o") || fs::last_write_time(cFile.string()+".c") > fs::last_write_time((buildDir/cFile.filename()).string()+"_source.o")) { @@ -424,6 +431,9 @@ namespace Crafter { return buildResult; } + std::cout << "bruh 8" << std::endl; + + if(config.target != "wasm32-wasi") { command += " -L/usr/local/lib"; } diff --git a/implementations/main.cpp b/implementations/main.cpp index 43c35ce..192587d 100644 --- a/implementations/main.cpp +++ b/implementations/main.cpp @@ -66,6 +66,9 @@ int main(int argc, char* argv[]) { projectPath = filepath; } + #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32) + AutoDetect(); + #endif Project project(std::move(projectPath)); if(command == "build") { diff --git a/project.json b/project.json index cbc7bf9..b553389 100644 --- a/project.json +++ b/project.json @@ -63,7 +63,6 @@ "extends": ["base", "libs-windows-msvc-debug"], "type":"library", "implementations": ["implementations/main"], - "lib_dirs": ["C:\\VulkanSDK\\1.4.341.1\\Lib"], "debug": true } ]