From 09235c97f3a4fe243ae6fad581471c08fd5faeb3 Mon Sep 17 00:00:00 2001 From: louist103 Date: Mon, 18 Jul 2022 17:36:55 -0400 Subject: Custom header guards. --- ZAPD/ZFile.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'ZAPD/ZFile.cpp') diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp index b81399e..34c57f5 100644 --- a/ZAPD/ZFile.cpp +++ b/ZAPD/ZFile.cpp @@ -98,6 +98,14 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename) if (outNameXml != nullptr) outName = outNameXml; + const char* customHeaderGuard = reader->Attribute("CustomGuard"); + + if (customHeaderGuard != nullptr) + { + useCustomHeaderGuard = true; + customGuard = customHeaderGuard; + } + // TODO: This should be a variable on the ZFile, but it is a large change in order to force all // ZResource types to have a parent ZFile. const char* gameStr = reader->Attribute("Game"); @@ -778,8 +786,13 @@ void ZFile::GenerateSourceHeaderFiles() std::string objectNameUpper = StringHelper::ToUpper(GetName()); - formatter.Write(StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", + if (!useCustomHeaderGuard) + formatter.Write(StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", objectNameUpper.c_str(), objectNameUpper.c_str())); + else + formatter.Write(StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", + customGuard.c_str(), customGuard.c_str())); + for (ZResource* res : resources) { -- cgit v1.2.3 From a44c491a3aee6dd9f111edb648443d46a4fc2f76 Mon Sep 17 00:00:00 2001 From: louist103 Date: Mon, 18 Jul 2022 23:32:51 -0400 Subject: Use file name for guard. --- ZAPD/ZFile.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'ZAPD/ZFile.cpp') diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp index 34c57f5..adc0c0b 100644 --- a/ZAPD/ZFile.cpp +++ b/ZAPD/ZFile.cpp @@ -98,14 +98,6 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename) if (outNameXml != nullptr) outName = outNameXml; - const char* customHeaderGuard = reader->Attribute("CustomGuard"); - - if (customHeaderGuard != nullptr) - { - useCustomHeaderGuard = true; - customGuard = customHeaderGuard; - } - // TODO: This should be a variable on the ZFile, but it is a large change in order to force all // ZResource types to have a parent ZFile. const char* gameStr = reader->Attribute("Game"); @@ -784,15 +776,10 @@ void ZFile::GenerateSourceHeaderFiles() { OutputFormatter formatter; - std::string objectNameUpper = StringHelper::ToUpper(GetName()); - - if (!useCustomHeaderGuard) - formatter.Write(StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", - objectNameUpper.c_str(), objectNameUpper.c_str())); - else - formatter.Write(StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", - customGuard.c_str(), customGuard.c_str())); + std::string guard = StringHelper::ToUpper(outName.stem().string()); + formatter.Write( + StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", guard.c_str(), guard.c_str())); for (ZResource* res : resources) { -- cgit v1.2.3