This commit is contained in:
parent
94db4f2780
commit
0819baf6d3
8 changed files with 170 additions and 117 deletions
|
|
@ -33,28 +33,21 @@ namespace Crafter {
|
|||
Define(std::string&& name, std::string&& value): name(std::move(name)), value(std::move(value)) { }
|
||||
};
|
||||
|
||||
export class Dependency {
|
||||
public:
|
||||
std::string path;
|
||||
std::string configuration;
|
||||
std::string commit;
|
||||
std::string branch;
|
||||
Dependency(std::string&& path, std::string&& configuration, std::string&& commit, std::string&& branch): path(std::move(path)), configuration(std::move(configuration)), commit(std::move(commit)), branch(std::move(branch)) { }
|
||||
};;
|
||||
|
||||
export enum ConfigurationType {
|
||||
CRAFTER_CONFIGURATION_TYPE_EXECUTABLE,
|
||||
CRAFTER_CONFIGURATION_TYPE_LIBRARY,
|
||||
CRAFTER_CONFIGURATION_TYPE_SHARED_LIBRARY,
|
||||
};
|
||||
|
||||
export class Project;
|
||||
export class Configuration {
|
||||
public:
|
||||
std::string name;
|
||||
std::string standard;
|
||||
std::vector<std::unique_ptr<Module>> interfaces;
|
||||
std::vector<Implementation> implementations;
|
||||
std::vector<Dependency> dependencies;
|
||||
std::vector<fs::path> c_files;
|
||||
std::vector<std::tuple<std::shared_ptr<Project>, Configuration&>> dependencies;
|
||||
std::vector<Shader> shaders;
|
||||
std::vector<fs::path> additionalFiles;
|
||||
std::vector<Define> defines;
|
||||
|
|
@ -64,7 +57,7 @@ namespace Crafter {
|
|||
bool debug;
|
||||
std::vector<std::string> libs;
|
||||
Configuration(std::string&& name);
|
||||
Configuration(const nlohmann::json& configs, const nlohmann::json& config, fs::path workingDir);
|
||||
void SetDataFromJson(const nlohmann::json& configs, const nlohmann::json& config, fs::path workingDir);
|
||||
Configuration(const nlohmann::json& configs, const nlohmann::json& config, fs::path workingDir, const Project& project);
|
||||
void SetDataFromJson(const nlohmann::json& configs, const nlohmann::json& config, fs::path workingDir, const Project& project);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue