From 6976eda717026a37d5d08a082fc87c58b017a9e5 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 28 Sep 2014 19:32:31 -0700 Subject: [PATCH] * Add configuration for Sakura specific types --- include/Athena/Global.hpp | 2 ++ include/Athena/Sprite.hpp | 2 ++ include/Athena/SpriteFile.hpp | 6 +++++- include/Athena/SpriteFileReader.hpp | 2 ++ include/Athena/SpriteFileWriter.hpp | 2 ++ include/Athena/SpriteFrame.hpp | 2 ++ include/Athena/SpritePart.hpp | 2 ++ src/Athena/Sprite.cpp | 3 +++ src/Athena/SpriteFile.cpp | 3 +++ src/Athena/SpriteFileReader.cpp | 2 ++ src/Athena/SpriteFileWriter.cpp | 2 ++ src/Athena/SpriteFrame.cpp | 2 ++ src/Athena/SpritePart.cpp | 2 ++ 13 files changed, 31 insertions(+), 1 deletion(-) diff --git a/include/Athena/Global.hpp b/include/Athena/Global.hpp index cb67236..00188c5 100644 --- a/include/Athena/Global.hpp +++ b/include/Athena/Global.hpp @@ -68,6 +68,7 @@ enum class Endian BigEndian }; +#ifndef ATHENA_NO_SAKURA namespace Sakura { @@ -94,6 +95,7 @@ public: typedef Vector2D Vector2Di; typedef Vector2D Vector2Df; } // Sakura +#endif // ATHENA_NO_SAKURA } // Athena std::ostream& operator<<(std::ostream& os, const Athena::SeekOrigin& origin); diff --git a/include/Athena/Sprite.hpp b/include/Athena/Sprite.hpp index ba2e798..baa39df 100644 --- a/include/Athena/Sprite.hpp +++ b/include/Athena/Sprite.hpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -143,3 +144,4 @@ Q_DECLARE_METATYPE(Athena::Sakura::Sprite*) #endif #endif // SSPRITE_HPP +#endif // ATHENA_NO_SAKURA diff --git a/include/Athena/SpriteFile.hpp b/include/Athena/SpriteFile.hpp index 4c04a05..d6fc0fc 100644 --- a/include/Athena/SpriteFile.hpp +++ b/include/Athena/SpriteFile.hpp @@ -1,4 +1,5 @@ -// This file is part of libAthena. +#ifndef ATHENA_NO_SAKURA +// This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -278,3 +279,6 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpriteFile*) Q_DECLARE_METATYPE(Athena::Sakura::STexture*) #endif #endif // SSPRITE_HPP + +#endif // ATHENA_NO_SAKURA + diff --git a/include/Athena/SpriteFileReader.hpp b/include/Athena/SpriteFileReader.hpp index f8c92f2..f599eaa 100644 --- a/include/Athena/SpriteFileReader.hpp +++ b/include/Athena/SpriteFileReader.hpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -42,3 +43,4 @@ public: #endif // SSPRITEFILEREADER_HPP +#endif // ATHENA_NO_SAKURA diff --git a/include/Athena/SpriteFileWriter.hpp b/include/Athena/SpriteFileWriter.hpp index 3c9e29c..3b37e05 100644 --- a/include/Athena/SpriteFileWriter.hpp +++ b/include/Athena/SpriteFileWriter.hpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -42,3 +43,4 @@ public: } // io } // zelda #endif // SSPRITEFILEWRITER_HPP +#endif // ATHENA_NO_SAKURA diff --git a/include/Athena/SpriteFrame.hpp b/include/Athena/SpriteFrame.hpp index 576ebfd..adde8c4 100644 --- a/include/Athena/SpriteFrame.hpp +++ b/include/Athena/SpriteFrame.hpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -97,3 +98,4 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpriteFrame*); #endif #endif // SSPRITEFRAME_HPP +#endif // ATHENA_NO_SAKURA diff --git a/include/Athena/SpritePart.hpp b/include/Athena/SpritePart.hpp index 92f3990..1282334 100644 --- a/include/Athena/SpritePart.hpp +++ b/include/Athena/SpritePart.hpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -213,3 +214,4 @@ Q_DECLARE_METATYPE(Athena::Sakura::SpritePart*) #endif #endif // SSPRITEPART_HPP +#endif // ATHENA_NO_SAKURA diff --git a/src/Athena/Sprite.cpp b/src/Athena/Sprite.cpp index 5940360..b96c9be 100644 --- a/src/Athena/Sprite.cpp +++ b/src/Athena/Sprite.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -303,3 +304,5 @@ SpriteFile* Sprite::root() const } } } + +#endif // ATHENA_NO_SAKURA diff --git a/src/Athena/SpriteFile.cpp b/src/Athena/SpriteFile.cpp index b155819..74fcd81 100644 --- a/src/Athena/SpriteFile.cpp +++ b/src/Athena/SpriteFile.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -329,3 +330,5 @@ void SpriteFile::setTextures(QList textures) #endif } // Sakura } // zelda + +#endif // ATHENA_NO_SAKURA diff --git a/src/Athena/SpriteFileReader.cpp b/src/Athena/SpriteFileReader.cpp index 89189bc..680a864 100644 --- a/src/Athena/SpriteFileReader.cpp +++ b/src/Athena/SpriteFileReader.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -216,3 +217,4 @@ Sakura::SpriteFile* SpriteFileReader::readFile() } } // io } // zelda +#endif //ATHENA_NO_SAKURA diff --git a/src/Athena/SpriteFileWriter.cpp b/src/Athena/SpriteFileWriter.cpp index 9a919d5..1dc6f1d 100644 --- a/src/Athena/SpriteFileWriter.cpp +++ b/src/Athena/SpriteFileWriter.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -113,3 +114,4 @@ void SpriteFileWriter::writeFile(Sakura::SpriteFile* file) } // io } // zelda +#endif // ATHENA_NO_SAKURA diff --git a/src/Athena/SpriteFrame.cpp b/src/Athena/SpriteFrame.cpp index a284790..4074c16 100644 --- a/src/Athena/SpriteFrame.cpp +++ b/src/Athena/SpriteFrame.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -80,3 +81,4 @@ Sprite* SpriteFrame::root() const } // Sakura } // zelda +#endif // ATHENA_NO_SAKURA diff --git a/src/Athena/SpritePart.cpp b/src/Athena/SpritePart.cpp index 49572b2..e5af3fd 100644 --- a/src/Athena/SpritePart.cpp +++ b/src/Athena/SpritePart.cpp @@ -1,3 +1,4 @@ +#ifndef ATHENA_NO_SAKURA // This file is part of libAthena. // // libAthena is free software: you can redistribute it and/or modify @@ -200,3 +201,4 @@ SpriteFrame* SpritePart::root() const } } } +#endif // ATHENA_NO_SAKURA