diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-09-20 17:39:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 12:39:46 -0400 |
| commit | 913810fcd6d8bdb8045c0d99a2f507d7add49283 (patch) | |
| tree | c4041af0151d1e4336250c30ac35941071a30fdf /ZAPD/ZRoom | |
| parent | ba947126665bf7a968aa2e71410842b8746f4849 (diff) | |
Improve makefiles (#187)
* Rewrite makefiles, eliminate all the extra clang warnings
* Include stdexcept in BinaryReader
* Update gitignore
* Clean up flags, add LLD option
* Update readme to mention LLD
* Update ExporterTest makefile in line with the others
* OUTPUT_OPTION and remove redundant Main rule
* Order arguments consistently, add note on submake variables
Diffstat (limited to 'ZAPD/ZRoom')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetRoomList.h | 2 | ||||
| -rw-r--r-- | ZAPD/ZRoom/ZRoom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ZAPD/ZRoom/Commands/SetRoomList.h b/ZAPD/ZRoom/Commands/SetRoomList.h index fcf8c17..ae20351 100644 --- a/ZAPD/ZRoom/Commands/SetRoomList.h +++ b/ZAPD/ZRoom/Commands/SetRoomList.h @@ -23,7 +23,7 @@ public: void ParseRawData() override; void DeclareVar(const std::string& prefix, const std::string body); - std::string GetBodySourceCode() const; + std::string GetBodySourceCode() const override; std::string GetSourceOutputCode(const std::string& prefix) override; std::string GetSourceTypeName() const override; diff --git a/ZAPD/ZRoom/ZRoom.h b/ZAPD/ZRoom/ZRoom.h index 60be252..993baaf 100644 --- a/ZAPD/ZRoom/ZRoom.h +++ b/ZAPD/ZRoom/ZRoom.h @@ -34,7 +34,7 @@ public: void DeclareReferencesLate(const std::string& prefix) override; void DeclareVar(const std::string& prefix, const std::string body); - std::string GetBodySourceCode() const; + std::string GetBodySourceCode() const override; std::string GetDefaultName(const std::string& prefix) const; size_t GetDeclarationSizeFromNeighbor(uint32_t declarationAddress); |