Merge pull request #257 from kimkulling/feature/cleanup_io_system

Cleanups
kimkulling · Dec 13, 2024 · e8b0d93 · e8b0d93
2 parents d23ee05 + e5f4b67
commit e8b0d93
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 3,040 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES( BEFORE
     contrib/assimp/include
     contrib/stb
     contrib/glew/include
-    contrib/unzip
     contrib/cppcore/include
     contrib/assimp/contrib/zlib
     contrib/cppcore/contrib/gtest-1.7.0/include
@@ -111,7 +110,6 @@ ENDIF(OSRE_BUILD_SAMPLES)
 
 set(cppcore_BUILD_UNITTESTS OFF CACHE BOOL "no cppcore unittests")
 ADD_SUBDIRECTORY( contrib/cppcore )
-ADD_SUBDIRECTORY( contrib/unzip )
 
 # Config for assimp
 SET(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "no assimp tools")

diff --git a/contrib/cppcore b/contrib/cppcore
diff --git a/contrib/unzip/CMakeLists.txt b/contrib/unzip/CMakeLists.txt
diff --git a/contrib/unzip/ChangeLogUnzip b/contrib/unzip/ChangeLogUnzip
diff --git a/contrib/unzip/crypt.h b/contrib/unzip/crypt.h
+1 −2		CMakeLists.txt
+0 −64		doc/Common.md
+0 −32		doc/Memory.md
+1 −3		doc/index.md
+1 −1		include/cppcore/Common/Hash.h
+1 −1		include/cppcore/Container/THashMap.h
+3 −3		include/cppcore/IO/FileSystem.h
+1 −1		include/cppcore/Memory/TDefaultAllocator.h
+2 −2		include/cppcore/Memory/TPoolAllocator.h
+0 −161		include/cppcore/Memory/TScratchAllocator.h
+2 −4		include/cppcore/Memory/TStackAllocator.h
+3 −1		test/Random/RandomGeneratorTest.cpp
+0 −67		test/memory/TScratchAllocatorTest.cpp
+3 −1		test/memory/TStackAllocatorTest.cpp