refactor third-party libs

CMakeLists.txt

@@ -17,7 +17,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_SOURCE_DIR}/include/Third_party)
+include_directories(${CMAKE_SOURCE_DIR}/Third_party)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
@@ -33,7 +33,7 @@ set(SOURCE_FILES
 
         ${CMAKE_SOURCE_DIR}/src/SubDirectory.cpp
 
-        ${CMAKE_SOURCE_DIR}/src/Third_party/SQLite/sqlite3.c
+        ${CMAKE_SOURCE_DIR}/Third_party/SQLite/sqlite3.c
 
         ${CMAKE_SOURCE_DIR}/src/Subfiles/TextSubfile.cpp
 
@@ -78,12 +78,12 @@ add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/src/Exam
 
 foreach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)
     if(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/lib/Third_Party/Zlib/zlibstatic.lib)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/lib/Third_Party/Yaml-cpp/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-cpp/libyaml-cppmt.lib)
         target_link_libraries(${TARGET} vcruntime.lib MSVCRT.lib)
     else(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/lib/Third_Party/Zlib/libzlibstatic.a)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/lib/Third_Party/Yaml-cpp/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-cpp/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)

include/DatFile.h

@@ -16,7 +16,7 @@
 #include <unordered_map>
 #include <set>
 #include <vector>
-#include <Third_party/yaml-cpp/node/node.h>
+#include <yaml-cpp/node/node.h>
 #include <unordered_set>
 #include "Database.h"
 

src/Examples/patcher_example.cpp

@@ -15,9 +15,6 @@
 using namespace LOTRO_DAT;
 using namespace std;
 
-const std::string rulocale_filename = "rulocale.dbgm";
-const std::string enlocale_filename = "enlocale.dbgm";
-
 int main() {
     std::cout << "Gi1dor's LotRO .dat patcher ver. 2.0.0" << std::endl;
     freopen("errors.log", "w", stderr);