Merge pull request #3 from falltergeist/feature/update-vfs

Update vfs dependency. Use vfs-memory module

Author: alexeevdv

.gitmodules

@@ -1,4 +1,6 @@
+[submodule "submodules/falltergeist/vfs-memory"]
+	path = submodules/falltergeist/vfs-memory
+	url = https://github.com/falltergeist/vfs-memory.git
 [submodule "submodules/falltergeist/vfs"]
-    path = submodules/falltergeist/vfs
-    url = https://github.com/falltergeist/vfs.git
-    tag = 0.2.0
+	path = submodules/falltergeist/vfs
+	url = https://github.com/falltergeist/vfs.git

CHANGELOG.md

@@ -1,6 +1,7 @@
 Under development
 -----------------
-
+- [feature] Update vfs dependency. Use vfs-memory module (alexeevdv)
+ 
 0.1.1 (2022-05-13)
 -----------------
 - [bug] Can not use this module and vfs at the same time in the top level CMake file (alexeevdv)

CMakeLists.txt

@@ -24,6 +24,11 @@ if(NOT TARGET falltergeist::vfs)
     add_subdirectory(submodules/falltergeist/vfs)
 endif()
 
+if(NOT TARGET falltergeist::vfs::memory)
+    add_subdirectory(submodules/falltergeist/vfs-memory)
+endif()
+
+
 find_package(ZLIB REQUIRED)
 if(NOT ZLIB_FOUND)
     message(FATAL_ERROR "zlib library not found")
@@ -63,4 +68,5 @@ target_link_libraries(
     ${PROJECT_NAME}
     ${ZLIB_LIBRARIES}
     falltergeist::vfs
+    falltergeist::vfs::memory
 )

README.md

@@ -1,2 +1,6 @@
 # vfs-dat2
 Fallout 2 DAT archive VFS module
+
+## Dependencies
+- [vfs](https://github.com/falltergeist/vfs) ^0.4.0
+- [vfs-memory](https://github.com/falltergeist/vfs-memory) ^0.1.0

include/falltergeist/vfs/DatArchiveDriver.h

@@ -1,8 +1,13 @@
 #pragma once
 
-#include "DatArchiveEntry.h"
-#include "DatArchiveStreamWrapper.h"
+// Project includes
+#include "falltergeist/vfs/DatArchiveEntry.h"
+#include "falltergeist/vfs/DatArchiveStreamWrapper.h"
+
+// Third party includes
 #include "falltergeist/vfs/IDriver.h"
+
+// stdlib
 #include <map>
 #include <memory>
 

include/falltergeist/vfs/DatArchiveEntry.h

@@ -1,5 +1,11 @@
 #pragma once
 
+// Project includes
+
+// Third party includes
+
+// stdlib
+
 namespace Falltergeist::VFS {
     struct DatArchiveEntry {
         unsigned int packedSize = 0;

include/falltergeist/vfs/DatArchiveFile.h

@@ -1,7 +1,12 @@
 #pragma once
 
-#include "DatArchiveEntry.h"
+// Project includes
+#include "falltergeist/vfs/DatArchiveEntry.h"
+
+// Third party includes
 #include "falltergeist/vfs/IFile.h"
+
+// stdlib
 #include <functional>
 
 namespace Falltergeist::VFS {

include/falltergeist/vfs/DatArchiveStreamWrapper.h

@@ -1,9 +1,14 @@
 #pragma once
 
+// Project includes
+#include "falltergeist/vfs/DatArchiveEntry.h"
+
+// Third party includes
+
+// stdlib
 #include <fstream>
 #include <cstdint>
 #include <map>
-#include "DatArchiveEntry.h"
 
 namespace Falltergeist::VFS {
     class DatArchiveStreamWrapper final {

src/DatArchiveDriver.cpp

@@ -1,7 +1,12 @@
+// Project includes
 #include "falltergeist/vfs/DatArchiveDriver.h"
 #include "falltergeist/vfs/DatArchiveFile.h"
+
+// Third party includes
 #include "falltergeist/vfs/MemoryFile.h"
 #include "zlib.h"
+
+// stdlib
 #include <algorithm>
 
 namespace Falltergeist::VFS {

src/DatArchiveFile.cpp

@@ -1,4 +1,9 @@
+// Project includes
 #include "falltergeist/vfs/DatArchiveFile.h"
+
+// Third party includes
+
+// stdlib
 #include <algorithm>
 
 namespace Falltergeist::VFS {