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

dep fix

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-11-09 20:29:30 +01:00
commit 89302a5534
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,7 +208,7 @@ namespace Crafter {
Project project = Project::LoadFromJSON(config.dependencies[i].path); Project project = Project::LoadFromJSON(config.dependencies[i].path);
for(Configuration& depConfig : project.configurations) { for(Configuration& depConfig : project.configurations) {
if(depConfig.name == config.dependencies[i].configuration){ if(depConfig.name == config.dependencies[i].configuration){
fs::path depBuildDir = fs::path(config.dependencies[i].path).parent_path()/depConfig.buildDir; fs::path depBuildDir = fs::path(config.dependencies[i].path).parent_path()/project.buildDir/depConfig.name;
project.Build(depConfig, pcmDir, binDir, depBuildDir, project.name); project.Build(depConfig, pcmDir, binDir, depBuildDir, project.name);
libMutex.lock(); libMutex.lock();
if (depLibSet.insert(project.name).second) { if (depLibSet.insert(project.name).second) {

2
interfaces/Crafter.Build-Configuration.cppm
View file

@ -51,8 +51,6 @@ namespace Crafter {
export class Configuration { export class Configuration {
public: public:
std::string name; std::string name;
fs::path buildDir;
fs::path binDir;
std::string standard; std::string standard;
std::vector<std::unique_ptr<Module>> interfaces; std::vector<std::unique_ptr<Module>> interfaces;
std::vector<Implementation> implementations; std::vector<Implementation> implementations;