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-01 20:17:50 +01:00
commit 8b613a9f0f
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,8 @@ namespace Crafter {
#endif #endif
#if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32) #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32)
AutoDetect(); AutoDetect();
target = RunCommand(std::format("{} && clang-cl.exe -print-target-triple", vsVars)); target = "x86_64-pc-windows-msvc";
//target = RunCommand(std::format("{} && clang-cl.exe -print-target-triple", vsVars));
#endif #endif
target.pop_back(); target.pop_back();
} }

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

@ -473,11 +473,11 @@ namespace Crafter {
#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
RunCommandIgnore(std::format("ar r {}.a {}", (binDir/fs::path(std::string("lib")+outputName)).string(), files)); RunClang(std::format("ar r {}.a {}", (binDir/fs::path(std::string("lib")+outputName)).string(), files));
#endif #endif
#if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32) #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32)
RunCommandIgnore(std::format("{} && lib.exe {} /OUT:{}.lib", vsVars, files, (binDir/fs::path(outputName)).string())); RunClang(std::format("{} && lib.exe {} /OUT:{}.lib", vsVars, files, (binDir/fs::path(outputName)).string()));
#endif #endif
} else { } else {
#ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu #ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu

1
project.json
View file

@ -63,6 +63,7 @@
"extends": ["base", "libs-windows-msvc-debug"], "extends": ["base", "libs-windows-msvc-debug"],
"type":"library", "type":"library",
"implementations": ["implementations/main"], "implementations": ["implementations/main"],
"lib_dirs": ["C:\\VulkanSDK\\1.4.341.1\\Lib"],
"debug": true "debug": true
} }
] ]