This commit is contained in:
parent
9f372fb608
commit
37e43b673f
2 changed files with 2 additions and 6 deletions
|
|
@ -152,15 +152,11 @@ namespace Crafter {
|
||||||
|
|
||||||
if(!fs::exists(stdPcm) || fs::last_write_time(stdPcm) < fs::last_write_time(sourceFilePath)) {
|
if(!fs::exists(stdPcm) || fs::last_write_time(stdPcm) < fs::last_write_time(sourceFilePath)) {
|
||||||
fs::copy(sourceFilePath, stdcppm, fs::copy_options::overwrite_existing);
|
fs::copy(sourceFilePath, stdcppm, fs::copy_options::overwrite_existing);
|
||||||
std::string result = RunCommand(std::format("cd {}\\{} && \"{} && clang-cl.exe /EHsc /MD /std:c++latest --target=x86_64-pc-windows-msvc -Wno-include-angled-in-module-purview -Wno-reserved-identifier -Wno-reserved-module-identifier --precompile std.cppm -o std.pcm", exeDir.string(), config.target, vsVars, stdPcm));
|
std::string result = RunCommand(std::format("cd {}\\{} && {} && clang-cl.exe /EHsc /MD /std:c++latest --target=x86_64-pc-windows-msvc -Wno-include-angled-in-module-purview -Wno-reserved-identifier -Wno-reserved-module-identifier --precompile std.cppm -o std.pcm", exeDir.string(), config.target, vsVars, stdPcm));
|
||||||
if(result != "") {
|
if(result != "") {
|
||||||
std::cout << result << std::endl;
|
|
||||||
throw std::runtime_error(result);
|
throw std::runtime_error(result);
|
||||||
}
|
}
|
||||||
result = RunCommand(std::format("cd {}\\{} && {} && cl.exe /std:c++latest /EHsc /nologo /W4 /MD /c \"{}\"", exeDir.string(), config.target, vsVars, sourceFilePath));
|
result = RunCommand(std::format("cd {}\\{} && {} && cl.exe /std:c++latest /EHsc /nologo /W4 /MD /c \"{}\"", exeDir.string(), config.target, vsVars, sourceFilePath));
|
||||||
std::cout << std::format("cd {}\\{} && {} && cl.exe /std:c++latest /EHsc /nologo /W4 /MD /c \"{}\"", exeDir.string(), config.target, vsVars, sourceFilePath) << std::endl;
|
|
||||||
std::cout << result << std::endl;
|
|
||||||
std::cout << "hello?" << std::endl;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -470,7 +470,7 @@ namespace Crafter {
|
||||||
libPath += std::format(" /LIBPATH:{}", lib);
|
libPath += std::format(" /LIBPATH:{}", lib);
|
||||||
}
|
}
|
||||||
|
|
||||||
buildResult.errors = RunCommand(std::format("{} && link.exe {} {} {}\\{}\\std.o msvcrt.lib kernel32.lib user32.lib /OUT:{}.exe", vsVars, libPath, files, exeDir.string(), config.target, (binDir/outputName).string()));
|
buildResult.errors = RunCommand(std::format("{} && link.exe {} {} {}\\{}\\std.obj msvcrt.lib kernel32.lib user32.lib /OUT:{}.exe", vsVars, libPath, files, exeDir.string(), config.target, (binDir/outputName).string()));
|
||||||
#endif
|
#endif
|
||||||
} else if(config.type == CRAFTER_CONFIGURATION_TYPE_LIBRARY) {
|
} else if(config.type == CRAFTER_CONFIGURATION_TYPE_LIBRARY) {
|
||||||
#ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu
|
#ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue