aboutsummaryrefslogtreecommitdiff
path: root/source/Irrlicht/CZipReader.cpp
diff options
context:
space:
mode:
authorVitaliy <numzer0@yandex.ru>2023-03-11 17:04:09 +0300
committerGitHub <noreply@github.com>2023-03-11 15:04:09 +0100
commit5a5a7d04b71b576ac9eed1bb58110009f8b46d0b (patch)
treea1d94ca96df4ddfdbfc2f190b8779a59da2073f4 /source/Irrlicht/CZipReader.cpp
parent1d43ea17ca8ee9a01262e9e34c5c89579b97397f (diff)
downloadirrlicht-5a5a7d04b71b576ac9eed1bb58110009f8b46d0b.tar.xz
Drop IrrCompileConfig (#163)
Diffstat (limited to 'source/Irrlicht/CZipReader.cpp')
-rw-r--r--source/Irrlicht/CZipReader.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp
index d394313..071f735 100644
--- a/source/Irrlicht/CZipReader.cpp
+++ b/source/Irrlicht/CZipReader.cpp
@@ -7,16 +7,11 @@
#include "os.h"
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
-
#include "CFileList.h"
#include "CReadFile.h"
#include "coreutil.h"
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_ZLIB_
- #include <zlib.h> // use system lib
-#endif
+#include <zlib.h> // use system lib
namespace irr
{
@@ -464,8 +459,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
}
case 8:
{
- #ifdef _IRR_COMPILE_WITH_ZLIB_
-
const u32 uncompressedSize = e.header.DataDescriptor.UncompressedSize;
c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf)
@@ -531,10 +524,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
}
else
return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
-
- #else
- return 0; // zlib not compiled, we cannot decompress the data.
- #endif
}
case 12:
{
@@ -560,5 +549,3 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
} // end namespace io
} // end namespace irr
-
-#endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_