diff --git a/Athena.pri b/Athena.pri index 2d90e37..0a1c35c 100644 --- a/Athena.pri +++ b/Athena.pri @@ -118,4 +118,3 @@ win32:HEADERS += \ OTHER_FILES += \ .travis.yml - diff --git a/Athena.pro b/Athena.pro index f642f6e..a962781 100644 --- a/Athena.pro +++ b/Athena.pro @@ -8,7 +8,7 @@ DESTDIR = ./lib contains(DEFINES, ATHENA_USE_QT){ QT += qt core } else { - QT -= qt core + QT = } CONFIG(debug, debug|release){ @@ -67,6 +67,11 @@ SOURCES += \ src/Athena/ZQuestFile.cpp \ src/Athena/ZQuestFileReader.cpp \ src/Athena/ZQuestFileWriter.cpp \ + src/Athena/PHYSFSFileReader.cpp \ + src/LZ77/LZBase.cpp \ + src/LZ77/LZLookupTable.cpp \ + src/LZ77/LZType10.cpp \ + src/LZ77/LZType11.cpp \ src/bn.cpp \ src/ec.cpp \ src/md5.cpp \ @@ -78,10 +83,10 @@ INCLUDEPATH += \ include HEADERS += \ + include/Athena/Global.hpp \ include/Athena/Stream.hpp \ include/Athena/Types.hpp \ include/Athena/Utility.hpp \ - include/Athena/Global.hpp \ include/Athena/Exception.hpp \ include/Athena/FileNotFoundException.hpp \ include/Athena/IOException.hpp \ @@ -89,19 +94,9 @@ HEADERS += \ include/Athena/InvalidOperationException.hpp \ include/Athena/FileReader.hpp \ include/Athena/FileWriter.hpp \ - include/utf8.h \ - include/utf8/checked.h \ - include/utf8/core.h \ - include/utf8/unchecked.h \ include/Athena/BinaryReader.hpp \ include/Athena/BinaryWriter.hpp \ include/Athena/NotImplementedException.hpp \ - include/aes.h \ - include/bn.h \ - include/ec.h \ - include/lzo.h \ - include/md5.h \ - include/sha1.h \ include/Athena/ALTTPEnums.hpp \ include/Athena/ALTTPFile.hpp \ include/Athena/ALTTPFileReader.hpp \ @@ -131,7 +126,31 @@ HEADERS += \ include/Athena/WiiSaveWriter.hpp \ include/Athena/ZQuestFile.hpp \ include/Athena/ZQuestFileReader.hpp \ - include/Athena/ZQuestFileWriter.hpp + include/Athena/ZQuestFileWriter.hpp \ + include/Athena/PHYSFSFileReader.hpp \ + include/LZ77/LZBase.hpp \ + include/LZ77/LZLookupTable.hpp \ + include/LZ77/LZType10.hpp \ + include/LZ77/LZType11.hpp \ + include/utf8.h \ + include/utf8/checked.h \ + include/utf8/core.h \ + include/utf8/unchecked.h \ + include/aes.h \ + include/bn.h \ + include/ec.h \ + include/lzo.h \ + include/md5.h \ + include/sha1.h OTHER_FILES += \ .travis.yml + +unix { + target.path = /usr/lib + headerFiles.files = $$PWD/include/* + headerFiles.path = /usr/include/Athena + pkgconf.files = libAthena.pc + pkgconf.path = /usr/lib/pkgconfig + INSTALLS += target headerFiles pkgconf +} diff --git a/include/Athena/ALTTPFileReader.hpp b/include/Athena/ALTTPFileReader.hpp index 6e07fb1..01ff2a7 100644 --- a/include/Athena/ALTTPFileReader.hpp +++ b/include/Athena/ALTTPFileReader.hpp @@ -18,9 +18,9 @@ #define __ALTTP_FILE_READER_HPP__ #include -#include "Types.hpp" -#include "BinaryReader.hpp" -#include "ALTTPQuest.hpp" +#include "Athena/Types.hpp" +#include "Athena/BinaryReader.hpp" +#include "Athena/ALTTPQuest.hpp" namespace Athena { diff --git a/include/Athena/ALTTPQuest.hpp b/include/Athena/ALTTPQuest.hpp index 057494a..975d173 100644 --- a/include/Athena/ALTTPQuest.hpp +++ b/include/Athena/ALTTPQuest.hpp @@ -20,8 +20,8 @@ #include "Types.hpp" #include #include -#include "ALTTPStructs.hpp" -#include "ALTTPEnums.hpp" +#include "Athena/ALTTPStructs.hpp" +#include "Athena/ALTTPEnums.hpp" namespace Athena { diff --git a/include/Athena/ALTTPStructs.hpp b/include/Athena/ALTTPStructs.hpp index bc41d62..da57f8f 100644 --- a/include/Athena/ALTTPStructs.hpp +++ b/include/Athena/ALTTPStructs.hpp @@ -19,7 +19,7 @@ #ifndef __DOXYGEN_IGNORE__ #include -#include "Types.hpp" +#include "Athena/Types.hpp" namespace Athena { diff --git a/include/Athena/BinaryReader.hpp b/include/Athena/BinaryReader.hpp index 40cd306..10ea02c 100644 --- a/include/Athena/BinaryReader.hpp +++ b/include/Athena/BinaryReader.hpp @@ -16,7 +16,7 @@ #ifndef __BINARYREADER_HPP__ #define __BINARYREADER_HPP__ -#include "Stream.hpp" +#include "Athena/Stream.hpp" #include #include diff --git a/include/Athena/BinaryWriter.hpp b/include/Athena/BinaryWriter.hpp index f7a6f1d..2a2ea97 100644 --- a/include/Athena/BinaryWriter.hpp +++ b/include/Athena/BinaryWriter.hpp @@ -16,7 +16,7 @@ #ifndef __BINARYWRITER_HPP__ #define __BINARYWRITER_HPP__ -#include "Stream.hpp" +#include "Athena/Stream.hpp" #include #include diff --git a/include/Athena/FileNotFoundException.hpp b/include/Athena/FileNotFoundException.hpp index 6fd931f..6eafa9f 100644 --- a/include/Athena/FileNotFoundException.hpp +++ b/include/Athena/FileNotFoundException.hpp @@ -16,7 +16,7 @@ #ifndef __FILENOTFOUNDEXCEPTION_HPP__ #define __FILENOTFOUNDEXCEPTION_HPP__ -#include "Exception.hpp" +#include "Athena/Exception.hpp" namespace Athena { diff --git a/include/Athena/FileReader.hpp b/include/Athena/FileReader.hpp index 010bd0d..2b5d09e 100644 --- a/include/Athena/FileReader.hpp +++ b/include/Athena/FileReader.hpp @@ -16,7 +16,7 @@ #ifndef FILESTREAM_HPP #define FILESTREAM_HPP -#include "Stream.hpp" +#include "Athena/Stream.hpp" #include #include diff --git a/include/Athena/IOException.hpp b/include/Athena/IOException.hpp index 2631cee..d25b9fb 100644 --- a/include/Athena/IOException.hpp +++ b/include/Athena/IOException.hpp @@ -16,7 +16,7 @@ #ifndef __IOEXCEPTION_HPP__ #define __IOEXCEPTION_HPP__ -#include "Exception.hpp" +#include "Athena/Exception.hpp" namespace Athena diff --git a/include/Athena/InvalidDataException.hpp b/include/Athena/InvalidDataException.hpp index b006195..e9c0378 100644 --- a/include/Athena/InvalidDataException.hpp +++ b/include/Athena/InvalidDataException.hpp @@ -16,7 +16,7 @@ #ifndef INVALIDDATAEXCEPTION_HPP #define INVALIDDATAEXCEPTION_HPP -#include "Exception.hpp" +#include "Athena/Exception.hpp" #include namespace Athena diff --git a/include/Athena/InvalidOperationException.hpp b/include/Athena/InvalidOperationException.hpp index 3daeb1d..f703720 100644 --- a/include/Athena/InvalidOperationException.hpp +++ b/include/Athena/InvalidOperationException.hpp @@ -18,7 +18,7 @@ #include #include -#include "Exception.hpp" +#include "Athena/Exception.hpp" namespace Athena { diff --git a/include/Athena/MCFileReader.hpp b/include/Athena/MCFileReader.hpp index 4245b17..d632ae9 100644 --- a/include/Athena/MCFileReader.hpp +++ b/include/Athena/MCFileReader.hpp @@ -17,7 +17,7 @@ #ifndef __MCFILEREADER_HPP__ #define __MCFILEREADER_HPP__ -#include "BinaryReader.hpp" +#include "Athena/BinaryReader.hpp" namespace Athena { diff --git a/include/Athena/MCFileWriter.hpp b/include/Athena/MCFileWriter.hpp index de2eefb..3ea89fb 100644 --- a/include/Athena/MCFileWriter.hpp +++ b/include/Athena/MCFileWriter.hpp @@ -17,8 +17,8 @@ #ifndef __MCFILEWRITER_HPP__ #define __MCFILEWRITER_HPP__ -#include "Types.hpp" -#include "BinaryWriter.hpp" +#include "Athena/Types.hpp" +#include "Athena/BinaryWriter.hpp" namespace Athena { diff --git a/include/Athena/SkywardSwordFileReader.hpp b/include/Athena/SkywardSwordFileReader.hpp index 87565ab..498ffc2 100644 --- a/include/Athena/SkywardSwordFileReader.hpp +++ b/include/Athena/SkywardSwordFileReader.hpp @@ -17,7 +17,7 @@ #ifndef __SSFILEREADER_HPP__ #define __SSFILEREADER_HPP__ -#include "BinaryReader.hpp" +#include "Athena/BinaryReader.hpp" namespace Athena { diff --git a/include/Athena/SkywardSwordFileWriter.hpp b/include/Athena/SkywardSwordFileWriter.hpp index 7c82ea9..a5a8359 100644 --- a/include/Athena/SkywardSwordFileWriter.hpp +++ b/include/Athena/SkywardSwordFileWriter.hpp @@ -17,7 +17,7 @@ #ifndef __SSFILEWRITER_HPP__ #define __SSFILEWRITER_HPP__ -#include "BinaryWriter.hpp" +#include "Athena/BinaryWriter.hpp" namespace Athena { diff --git a/include/Athena/SkywardSwordQuest.hpp b/include/Athena/SkywardSwordQuest.hpp index 4b4a2e9..c8ec5cc 100644 --- a/include/Athena/SkywardSwordQuest.hpp +++ b/include/Athena/SkywardSwordQuest.hpp @@ -18,7 +18,7 @@ #define SKYWARDSWORDQUEST_HPP #include "Athena/Global.hpp" -#include "ZQuestFile.hpp" +#include "Athena/ZQuestFile.hpp" namespace Athena { diff --git a/include/Athena/Utility.hpp b/include/Athena/Utility.hpp index 3219dfc..a3c23fd 100644 --- a/include/Athena/Utility.hpp +++ b/include/Athena/Utility.hpp @@ -20,7 +20,7 @@ #include #include #include -#include "Types.hpp" +#include "Athena/Types.hpp" namespace Athena { diff --git a/include/Athena/WiiImage.hpp b/include/Athena/WiiImage.hpp index 100701d..87a1a66 100644 --- a/include/Athena/WiiImage.hpp +++ b/include/Athena/WiiImage.hpp @@ -17,7 +17,7 @@ #ifndef __WIIIMAGE_HPP__ #define __WIIIMAGE_HPP__ -#include "Types.hpp" +#include "Athena/Types.hpp" namespace Athena { diff --git a/include/Athena/WiiSaveWriter.hpp b/include/Athena/WiiSaveWriter.hpp index 6edd09f..e9c2072 100644 --- a/include/Athena/WiiSaveWriter.hpp +++ b/include/Athena/WiiSaveWriter.hpp @@ -17,7 +17,7 @@ #ifndef __WII_SAVE_WRITER_HPP__ #define __WII_SAVE_WRITER_HPP__ -#include "BinaryWriter.hpp" +#include "Athena/BinaryWriter.hpp" namespace Athena { diff --git a/include/Athena/ZQuestFileReader.hpp b/include/Athena/ZQuestFileReader.hpp index 42acd11..52c58e2 100644 --- a/include/Athena/ZQuestFileReader.hpp +++ b/include/Athena/ZQuestFileReader.hpp @@ -17,7 +17,7 @@ #ifndef __ZQUESTFILEREADER_HPP__ #define __ZQUESTFILEREADER_HPP__ -#include "BinaryReader.hpp" +#include "Athena/BinaryReader.hpp" namespace Athena { diff --git a/libAthena.pc b/libAthena.pc new file mode 100644 index 0000000..184dc0c --- /dev/null +++ b/libAthena.pc @@ -0,0 +1,10 @@ +prefix=/usr +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: libAthena +Description: Basic cross platform IO library +Version: 1.0.0 +Cflags: -I${includedir}/Athena +Libs: -L${libdir} -lAthena +Requires: zlib