izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename to gIndividualIncludes

Browse Source
This commit is contained in:
AltoXorg
2024-04-20 10:25:02 -06:00
committed by Lywx
parent a2c0ff7392
commit ee04f056c4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+4 -4
View File
@@ -354,7 +354,7 @@ void Companion::ParseCurrentFileConfig(YAML::Node node) {
this->gEnablePadGen = GetSafeNode<bool>(node, "autopads", true);
this->gNodeForceProcessing = GetSafeNode<bool>(node, "force", false);
this->gSingleCodeFile = !GetSafeNode<bool>(node, "individual_data_incs", false);
this->gIndividualIncludes = GetSafeNode<bool>(node, "individual_data_incs", false);
}
void Companion::ParseHash() {
@@ -953,7 +953,7 @@ void Companion::Process() {
stream << "// 0x" << std::hex << std::uppercase << ASSET_PTR(result.endptr.value()) << "\n\n";
}
if(hasSize && i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code && this->gSingleCodeFile){
if(hasSize && i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code && !this->gIndividualIncludes){
int32_t startptr = ASSET_PTR(result.endptr.value());
int32_t end = ASSET_PTR(entries[i + 1].addr);
@@ -986,7 +986,7 @@ void Companion::Process() {
}
}
if (this->gConfig.exporterType == ExportType::Code && !this->gSingleCodeFile) {
if (this->gConfig.exporterType == ExportType::Code && this->gIndividualIncludes) {
fs::path outinc = fs::path(this->gConfig.outputPath) / this->gCurrentDirectory.parent_path() / (result.name + ".inc.c");
if(!exists(outinc.parent_path())){
@@ -1007,7 +1007,7 @@ void Companion::Process() {
this->gWriteMap.clear();
if (this->gConfig.exporterType != ExportType::Code || this->gSingleCodeFile) {
if (this->gConfig.exporterType != ExportType::Code || !this->gIndividualIncludes) {
std::string buffer = stream.str();
if(buffer.empty()) {
src/Companion.h
+2 -2
View File
@@ -118,7 +118,7 @@ public:
GBIMinorVersion GetGBIMinorVersion() const { return this->gConfig.gbi.subversion; }
std::unordered_map<std::string, std::vector<YAML::Node>> GetCourseMetadata() { return this->gCourseMetadata; }
std::optional<std::string> GetEnumFromValue(const std::string& key, int id);
bool IsSingleCodeFile() const { return this->gSingleCodeFile; }
bool IsSingleCodeFile() const { return this->gIndividualIncludes; }
std::optional<ParseResultData> GetParseDataByAddr(uint32_t addr);
std::optional<ParseResultData> GetParseDataBySymbol(const std::string& symbol);
@@ -154,7 +154,7 @@ private:
std::vector<uint8_t> gRomData;
std::filesystem::path gRomPath;
bool gNodeForceProcessing = false;
bool gSingleCodeFile = true;
bool gIndividualIncludes = false;
YAML::Node gHashNode;
std::shared_ptr<N64::Cartridge> gCartridge;
std::unordered_map<std::string, std::vector<YAML::Node>> gCourseMetadata;