Refactoring and updating for using as library

Created and mover 3rd-party projects to specific directory. Moved
headers to include directory.

CMakeLists.txt

@@ -16,57 +16,41 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 
-set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
-
-include_directories(${CMAKE_SOURCE_DIR}/Common/Yaml)
+include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_SOURCE_DIR}/Third-party/Yaml)
+include_directories(${CMAKE_SOURCE_DIR}/Third-party/SQLite)
+include_directories(${CMAKE_SOURCE_DIR}/Third-party/Zlib)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
 
 set(SOURCE_FILES
-        ${CMAKE_SOURCE_DIR}/Common/CommonFunctions.h
-        ${CMAKE_SOURCE_DIR}/Common/DatException.h
-        ${CMAKE_SOURCE_DIR}/LotroDatPatcher.h
-
-        ${CMAKE_SOURCE_DIR}/DatFile.cpp
-        ${CMAKE_SOURCE_DIR}/DatFile.h
+        ${CMAKE_SOURCE_DIR}/src/DatFile.cpp
 
-        ${CMAKE_SOURCE_DIR}/BinaryData.cpp
-        ${CMAKE_SOURCE_DIR}/BinaryData.h
+        ${CMAKE_SOURCE_DIR}/src/BinaryData.cpp
 
-        ${CMAKE_SOURCE_DIR}/Database.cpp
-        ${CMAKE_SOURCE_DIR}/Database.h
+        ${CMAKE_SOURCE_DIR}/src/Database.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/SubDirectory.cpp
-        ${CMAKE_SOURCE_DIR}/SubDirectory.h
+        ${CMAKE_SOURCE_DIR}/src/SubDirectory.cpp
 
-        ${CMAKE_SOURCE_DIR}/Common/SQLite/sqlite3.c
-        ${CMAKE_SOURCE_DIR}/Common/SQLite/sqlite3.h
+        ${CMAKE_SOURCE_DIR}/Third-party/SQLite/sqlite3.c
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/TextSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/TextSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/TextSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/JpgSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/JpgSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/JpgSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/DdsSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/DdsSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/DdsSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/OggSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/OggSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/OggSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/FontSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/FontSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/FontSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/WavSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/WavSubfile.h
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/WavSubfile.cpp
 
-        ${CMAKE_SOURCE_DIR}/Subfiles/UnknownSubfile.cpp
-        ${CMAKE_SOURCE_DIR}/Subfiles/UnknownSubfile.h
-        src/SubfileData.h)
+        ${CMAKE_SOURCE_DIR}/src/Subfiles/UnknownSubfile.cpp
+)
 
 set(CompilerFlags
         CMAKE_CXX_FLAGS
@@ -90,18 +74,18 @@ add_library(LotroDat_static STATIC ${SOURCE_FILES})
 # SHARED LIBRARY
 add_library(LotroDat SHARED ${SOURCE_FILES})
 # CONSOLE EXTRACTOR TOOL
-add_executable(LotRO_dat_extract_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Examples/extractor_example.cpp)
+add_executable(LotRO_dat_extract_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/src/Examples/extractor_example.cpp)
 # CONSOLE PATCHER TOOL
-add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Examples/patcher_example.cpp)
+add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/src/Examples/patcher_example.cpp)
 
 foreach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)
     if(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Common/Zlib/zlibstatic.lib)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Common/Yaml/libyaml-cppmt.lib)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third-Party/Zlib/zlibstatic.lib)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third-Party/Yaml/libyaml-cppmt.lib)
         target_link_libraries(${TARGET} vcruntime.lib MSVCRT.lib)
     else(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Common/Zlib/libzlibstatic.a)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Common/Yaml/libyaml-cpp.a)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third-Party/Zlib/libzlibstatic.a)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third-Party/Yaml/libyaml-cpp.a)
         target_link_libraries(${TARGET} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic)
     endif(MSVC)
 endforeach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)

src/Database.h → include/Database.h

@@ -5,9 +5,9 @@
 #ifndef LOTRO_DAT_PATCHER_DATABASE_H
 #define LOTRO_DAT_PATCHER_DATABASE_H
 
-#include "Common/SQLite/sqlite3.h"
+#include <sqlite3.h>
 #include <string>
-#include "yaml-cpp/yaml.h"
+#include <yaml-cpp/yaml.h>
 
 extern  "C++"
 {

src/LotroDatPatcher.h → include/LotroDatPatcher.h

@@ -5,7 +5,7 @@
 #include "DatFile.h"
 #include "Database.h"
 #include "SubfileData.h"
-#include "Common/DatException.h"
+#include "DatException.h"
 
-#include <yaml-cpp/yaml.h>
-#include "Common\ZLib\zlib.h"
+#include "yaml-cpp/yaml.h"
+#include "zlib.h"

src/BinaryData.cpp

@@ -2,9 +2,9 @@
 // Created by Иван_Архипов on 31.10.2017.
 //
 
-#include "BinaryData.h"
-#include "Common/DatException.h"
-#include "Common/ZLib/zlib.h"
+#include <BinaryData.h>
+#include <DatException.h>
+#include <zlib.h>
 #include <algorithm>
 
 extern  "C++"

src/DatFile.cpp

@@ -2,13 +2,13 @@
 // Created by Иван_Архипов on 31.10.2017.
 //
 
-#include "DatFile.h"
+#include "../include/DatFile.h"
 
-#include "BinaryData.h"
-#include "Common/DatException.h"
-#include "SubDirectory.h"
-#include "Subfile.h"
-#include "SubfileData.h"
+#include "../include/BinaryData.h"
+#include "../include/DatException.h"
+#include "../include/SubDirectory.h"
+#include "../include/Subfile.h"
+#include "../include/SubfileData.h"
 
 #include <locale>
 #include <algorithm>

src/Database.cpp

@@ -5,9 +5,9 @@
 #define _UNICODE 
 
 #include "Database.h"
-#include "Common/DatException.h"
+#include "DatException.h"
 #include "BinaryData.h"
-#include "Common/CommonFunctions.h"
+#include "CommonFunctions.h"
 #include "SubfileData.h"
 
 #include <cstring>

src/Examples/extractor_example.cpp

@@ -11,7 +11,7 @@
 #define mkdir(dir, mode) _mkdir(dir)
 #endif
 
-#include "../LotroDatPatcher.h"
+#include "../../include/LotroDatPatcher.h"
 using namespace LOTRO_DAT;
 
 

src/Examples/patcher_example.cpp

@@ -11,7 +11,7 @@
 #define mkdir(dir, mode) _mkdir(dir)
 #endif
 
-#include "../LotroDatPatcher.h"
+#include "../../include/LotroDatPatcher.h"
 using namespace LOTRO_DAT;
 using namespace std;
 

src/SubDirectory.cpp

@@ -1,12 +1,12 @@
 //
 // Created by Иван_Архипов on 07.11.2017.
 //
-#include "SubDirectory.h"
+#include "../include/SubDirectory.h"
 
-#include "DatFile.h"
-#include "Common/DatException.h"
-#include "Subfile.h"
-#include "BinaryData.h"
+#include "../include/DatFile.h"
+#include "../include/DatException.h"
+#include "../include/Subfile.h"
+#include "../include/BinaryData.h"
 
 #include "Subfiles/TextSubfile.h"
 #include "Subfiles/DdsSubfile.h"

src/Subfile.cpp

@@ -2,11 +2,11 @@
 // Created by Иван_Архипов on 01.11.2017.
 //
 
-#include "Subfile.h"
-#include "BinaryData.h"
-#include "DatFile.h"
-#include "Common/DatException.h"
-#include "SubfileData.h"
+#include "../include/Subfile.h"
+#include "../include/BinaryData.h"
+#include "../include/DatFile.h"
+#include "../include/DatException.h"
+#include "../include/SubfileData.h"
 
 #include <algorithm>
 

src/Subfiles/DdsSubfile.cpp

@@ -4,10 +4,10 @@
 
 #include "DdsSubfile.h"
 
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     DdsSubfile::DdsSubfile() = default;

src/Subfiles/DdsSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 #define LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class DdsSubfile : public Subfile {

src/Subfiles/FontSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "FontSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     FontSubfile::FontSubfile() = default;

src/Subfiles/FontSubfile.h

@@ -6,7 +6,7 @@
 #define LOTRO_DAT_LIBRARY_FONTSUBFILE_H
 
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class FontSubfile : public Subfile {

src/Subfiles/JpgSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "JpgSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     JpgSubfile::JpgSubfile() = default;

src/Subfiles/JpgSubfile.h

@@ -6,7 +6,7 @@
 #define LOTRO_DAT_LIBRARY_JPGSUBFILE_H
 
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class JpgSubfile : public Subfile {

src/Subfiles/OggSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "OggSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     OggSubfile::OggSubfile() = default;

src/Subfiles/OggSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 #define LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class OggSubfile : public Subfile {

src/Subfiles/TextSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "TextSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 #include <algorithm>
 #include <codecvt>
 #include <locale>

src/Subfiles/TextSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 #define LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 #include <vector>
 #include <unordered_map>
 

src/Subfiles/UnknownSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "UnknownSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     UnknownSubfile::UnknownSubfile() = default;

src/Subfiles/UnknownSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 #define LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class UnknownSubfile : public Subfile {

src/Subfiles/WavSubfile.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "WavSubfile.h"
-#include "../BinaryData.h"
-#include "../DatFile.h"
-#include "../Common/DatException.h"
-#include "../SubfileData.h"
+#include "../../include/BinaryData.h"
+#include "../../include/DatFile.h"
+#include "../../include/DatException.h"
+#include "../../include/SubfileData.h"
 
 namespace LOTRO_DAT {
     WavSubfile::WavSubfile() = default;

src/Subfiles/WavSubfile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 #define LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 
-#include "../Subfile.h"
+#include "../../include/Subfile.h"
 
 namespace LOTRO_DAT {
     class WavSubfile : public Subfile {