Ver Fonte

Refactor for usaging as library

Ivan Arkhipov há 6 anos atrás
pai
commit
6cb9bbcf3f
52 ficheiros alterados com 9 adições e 11 exclusões
  1. 6 8
      CMakeLists.txt
  2. 1 1
      include/DatFile.h
  3. 1 1
      include/Database.h
  4. 0 0
      include/Third_party/SQLite/sqlite3.h
  5. 0 0
      include/Third_party/ZLib/zconf.h
  6. 0 0
      include/Third_party/ZLib/zlib.h
  7. 0 0
      include/Third_party/yaml-cpp/anchor.h
  8. 0 0
      include/Third_party/yaml-cpp/binary.h
  9. 0 0
      include/Third_party/yaml-cpp/contrib/anchordict.h
  10. 0 0
      include/Third_party/yaml-cpp/contrib/graphbuilder.h
  11. 0 0
      include/Third_party/yaml-cpp/dll.h
  12. 0 0
      include/Third_party/yaml-cpp/emitfromevents.h
  13. 0 0
      include/Third_party/yaml-cpp/emitter.h
  14. 0 0
      include/Third_party/yaml-cpp/emitterdef.h
  15. 0 0
      include/Third_party/yaml-cpp/emittermanip.h
  16. 0 0
      include/Third_party/yaml-cpp/emitterstyle.h
  17. 0 0
      include/Third_party/yaml-cpp/eventhandler.h
  18. 0 0
      include/Third_party/yaml-cpp/exceptions.h
  19. 0 0
      include/Third_party/yaml-cpp/mark.h
  20. 0 0
      include/Third_party/yaml-cpp/node/convert.h
  21. 0 0
      include/Third_party/yaml-cpp/node/detail/bool_type.h
  22. 0 0
      include/Third_party/yaml-cpp/node/detail/impl.h
  23. 0 0
      include/Third_party/yaml-cpp/node/detail/iterator.h
  24. 0 0
      include/Third_party/yaml-cpp/node/detail/iterator_fwd.h
  25. 0 0
      include/Third_party/yaml-cpp/node/detail/memory.h
  26. 0 0
      include/Third_party/yaml-cpp/node/detail/node.h
  27. 0 0
      include/Third_party/yaml-cpp/node/detail/node_data.h
  28. 0 0
      include/Third_party/yaml-cpp/node/detail/node_iterator.h
  29. 0 0
      include/Third_party/yaml-cpp/node/detail/node_ref.h
  30. 0 0
      include/Third_party/yaml-cpp/node/emit.h
  31. 0 0
      include/Third_party/yaml-cpp/node/impl.h
  32. 0 0
      include/Third_party/yaml-cpp/node/iterator.h
  33. 0 0
      include/Third_party/yaml-cpp/node/node.h
  34. 0 0
      include/Third_party/yaml-cpp/node/parse.h
  35. 0 0
      include/Third_party/yaml-cpp/node/ptr.h
  36. 0 0
      include/Third_party/yaml-cpp/node/type.h
  37. 0 0
      include/Third_party/yaml-cpp/noncopyable.h
  38. 0 0
      include/Third_party/yaml-cpp/null.h
  39. 0 0
      include/Third_party/yaml-cpp/ostream_wrapper.h
  40. 0 0
      include/Third_party/yaml-cpp/parser.h
  41. 0 0
      include/Third_party/yaml-cpp/stlemitter.h
  42. 0 0
      include/Third_party/yaml-cpp/traits.h
  43. 0 0
      include/Third_party/yaml-cpp/yaml.h
  44. 0 0
      lib/Third_party/Yaml-cpp/libyaml-cpp.a
  45. 0 0
      lib/Third_party/Yaml-cpp/libyaml-cppmt.lib
  46. 0 0
      lib/Third_party/Yaml-cpp/libyaml-cppmtd.lib
  47. 0 0
      lib/Third_party/ZLib/libzlibstatic.a
  48. 0 0
      lib/Third_party/ZLib/zlibstatic.lib
  49. BIN
      lib/libLotroDat.dll.a
  50. BIN
      lib/libLotroDat_static.a
  51. 1 1
      src/Third_party/SQLite/shell.c
  52. 0 0
      src/Third_party/SQLite/sqlite3.c

+ 6 - 8
CMakeLists.txt

@@ -17,9 +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}/Third-party/Yaml)
-include_directories(${CMAKE_SOURCE_DIR}/Third-party/SQLite)
-include_directories(${CMAKE_SOURCE_DIR}/Third-party/Zlib)
+include_directories(${CMAKE_SOURCE_DIR}/include/Third_party)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_OUTPUT_DIR})
@@ -35,7 +33,7 @@ set(SOURCE_FILES
 
         ${CMAKE_SOURCE_DIR}/src/SubDirectory.cpp
 
-        ${CMAKE_SOURCE_DIR}/Third-party/SQLite/sqlite3.c
+        ${CMAKE_SOURCE_DIR}/src/Third_party/SQLite/sqlite3.c
 
         ${CMAKE_SOURCE_DIR}/src/Subfiles/TextSubfile.cpp
 
@@ -80,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}/Third-Party/Zlib/zlibstatic.lib)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third-Party/Yaml/libyaml-cppmt.lib)
+        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} vcruntime.lib MSVCRT.lib)
     else(MSVC)
-        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} ${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} -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)

+ 1 - 1
include/DatFile.h

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

+ 1 - 1
include/Database.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_PATCHER_DATABASE_H
 #define LOTRO_DAT_PATCHER_DATABASE_H
 
-#include <sqlite3.h>
+#include <SQLite/sqlite3.h>
 #include <string>
 #include <yaml-cpp/yaml.h>
 

+ 0 - 0
Third-party/SQLite/sqlite3.h → include/Third_party/SQLite/sqlite3.h


+ 0 - 0
Third-party/ZLib/zconf.h → include/Third_party/ZLib/zconf.h


+ 0 - 0
Third-party/ZLib/zlib.h → include/Third_party/ZLib/zlib.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/anchor.h → include/Third_party/yaml-cpp/anchor.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/binary.h → include/Third_party/yaml-cpp/binary.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/contrib/anchordict.h → include/Third_party/yaml-cpp/contrib/anchordict.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/contrib/graphbuilder.h → include/Third_party/yaml-cpp/contrib/graphbuilder.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/dll.h → include/Third_party/yaml-cpp/dll.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/emitfromevents.h → include/Third_party/yaml-cpp/emitfromevents.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/emitter.h → include/Third_party/yaml-cpp/emitter.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/emitterdef.h → include/Third_party/yaml-cpp/emitterdef.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/emittermanip.h → include/Third_party/yaml-cpp/emittermanip.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/emitterstyle.h → include/Third_party/yaml-cpp/emitterstyle.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/eventhandler.h → include/Third_party/yaml-cpp/eventhandler.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/exceptions.h → include/Third_party/yaml-cpp/exceptions.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/mark.h → include/Third_party/yaml-cpp/mark.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/convert.h → include/Third_party/yaml-cpp/node/convert.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/bool_type.h → include/Third_party/yaml-cpp/node/detail/bool_type.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/impl.h → include/Third_party/yaml-cpp/node/detail/impl.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/iterator.h → include/Third_party/yaml-cpp/node/detail/iterator.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/iterator_fwd.h → include/Third_party/yaml-cpp/node/detail/iterator_fwd.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/memory.h → include/Third_party/yaml-cpp/node/detail/memory.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/node.h → include/Third_party/yaml-cpp/node/detail/node.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/node_data.h → include/Third_party/yaml-cpp/node/detail/node_data.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/node_iterator.h → include/Third_party/yaml-cpp/node/detail/node_iterator.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/detail/node_ref.h → include/Third_party/yaml-cpp/node/detail/node_ref.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/emit.h → include/Third_party/yaml-cpp/node/emit.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/impl.h → include/Third_party/yaml-cpp/node/impl.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/iterator.h → include/Third_party/yaml-cpp/node/iterator.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/node.h → include/Third_party/yaml-cpp/node/node.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/parse.h → include/Third_party/yaml-cpp/node/parse.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/ptr.h → include/Third_party/yaml-cpp/node/ptr.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/node/type.h → include/Third_party/yaml-cpp/node/type.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/noncopyable.h → include/Third_party/yaml-cpp/noncopyable.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/null.h → include/Third_party/yaml-cpp/null.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/ostream_wrapper.h → include/Third_party/yaml-cpp/ostream_wrapper.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/parser.h → include/Third_party/yaml-cpp/parser.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/stlemitter.h → include/Third_party/yaml-cpp/stlemitter.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/traits.h → include/Third_party/yaml-cpp/traits.h


+ 0 - 0
Third-party/Yaml/yaml-cpp/yaml.h → include/Third_party/yaml-cpp/yaml.h


+ 0 - 0
Third-party/Yaml/libyaml-cpp.a → lib/Third_party/Yaml-cpp/libyaml-cpp.a


+ 0 - 0
Third-party/Yaml/libyaml-cppmt.lib → lib/Third_party/Yaml-cpp/libyaml-cppmt.lib


+ 0 - 0
Third-party/Yaml/libyaml-cppmtd.lib → lib/Third_party/Yaml-cpp/libyaml-cppmtd.lib


+ 0 - 0
Third-party/ZLib/libzlibstatic.a → lib/Third_party/ZLib/libzlibstatic.a


+ 0 - 0
Third-party/ZLib/zlibstatic.lib → lib/Third_party/ZLib/zlibstatic.lib


BIN
lib/libLotroDat.dll.a


BIN
lib/libLotroDat_static.a


+ 1 - 1
Third-party/SQLite/shell.c → src/Third_party/SQLite/shell.c

@@ -78,7 +78,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
-#include "sqlite3.h"
+#include "Third_party/SQLite/sqlite3.h"
 #if SQLITE_USER_AUTHENTICATION
 # include "sqlite3userauth.h"
 #endif

+ 0 - 0
Third-party/SQLite/sqlite3.c → src/Third_party/SQLite/sqlite3.c