Skip to content

Commit 3971ae0

Browse files
committed
Deleted NO_NBL_COMPILE_WITH macros from asset compile config file
1 parent cfcd21d commit 3971ae0

File tree

1 file changed

+10
-35
lines changed

1 file changed

+10
-35
lines changed

include/irr/asset/compile_config.h

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,81 +9,56 @@
99
/** This enables the engine to read and write encrypted BAW format files.
1010
If you comment this out, the engine will no longer read or write encrypted .baw files! */
1111
#define _NBL_COMPILE_WITH_OPENSSL_
12-
#ifdef NO_NBL_COMPILE_WITH_OPENSSL_
13-
#undef _NBL_COMPILE_WITH_OPENSSL_
14-
#endif
1512

1613
//! Define _NBL_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
1714
/** This enables the engine to read jpeg images. If you comment this out,
1815
the engine will no longer read .jpeg images. */
1916
#define _NBL_COMPILE_WITH_LIBJPEG_
20-
#ifdef NO_NBL_COMPILE_WITH_LIBJPEG_
21-
#undef _NBL_COMPILE_WITH_LIBJPEG_
22-
#endif
2317

2418
//! Define _NBL_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
2519
/** This enables the engine to read png images. If you comment this out,
2620
the engine will no longer read .png images. */
2721
#define _NBL_COMPILE_WITH_LIBPNG_
28-
#ifdef NO_NBL_COMPILE_WITH_LIBPNG_
29-
#undef _NBL_COMPILE_WITH_LIBPNG_
30-
#endif
3122

3223
//! Uncomment the following line if you want to ignore the deprecated warnings
3324
//#define IGNORE_DEPRECATED_WARNING
3425

3526
//! Define __NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_ if you want to open ZIP and GZIP archives
3627
/** ZIP reading has several more options below to configure. */
3728
#define __NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
38-
#ifdef NO__NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
39-
#undef __NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
40-
#endif
41-
#ifdef __NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
29+
30+
//#ifdef __NBL_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
31+
4232
//! Define _NBL_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
4333
/** This enables the engine to read from compressed .zip archives. If you
4434
disable this feature, the engine can still read archives, but only uncompressed
4535
ones. */
4636
#define _NBL_COMPILE_WITH_ZLIB_
47-
#ifdef NO_NBL_COMPILE_WITH_ZLIB_
48-
#undef _NBL_COMPILE_WITH_ZLIB_
49-
#endif
37+
5038
//! Define _NBL_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
5139
#define _NBL_COMPILE_WITH_ZIP_ENCRYPTION_
52-
#ifdef NO_NBL_COMPILE_WITH_ZIP_ENCRYPTION_
53-
#undef _NBL_COMPILE_WITH_ZIP_ENCRYPTION_
54-
#endif
40+
5541
//! Define _NBL_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
5642
/** bzip2 is superior to the original zip file compression modes, but requires
5743
a certain amount of memory for decompression and adds several files to the
5844
library. */
5945
#define _NBL_COMPILE_WITH_BZIP2_
60-
#ifdef NO_NBL_COMPILE_WITH_BZIP2_
61-
#undef _NBL_COMPILE_WITH_BZIP2_
62-
#endif
46+
6347
//! Define _NBL_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
6448
/** LZMA is a very efficient compression code, known from 7zip. Irrlicht
6549
currently only supports zip archives, though. */
6650
//#define _NBL_COMPILE_WITH_LZMA_
67-
#ifdef NO_NBL_COMPILE_WITH_LZMA_
68-
#undef _NBL_COMPILE_WITH_LZMA_
69-
#endif
70-
#endif
51+
52+
//#endif
7153

7254
//! Define __NBL_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
7355
#define __NBL_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
74-
#ifdef NO__NBL_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
75-
#undef __NBL_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
76-
#endif
56+
7757
//! Define __NBL_COMPILE_WITH_PAK_ARCHIVE_LOADER_ if you want to open ID software PAK archives
7858
#define __NBL_COMPILE_WITH_PAK_ARCHIVE_LOADER_
79-
#ifdef NO__NBL_COMPILE_WITH_PAK_ARCHIVE_LOADER_
80-
#undef __NBL_COMPILE_WITH_PAK_ARCHIVE_LOADER_
81-
#endif
59+
8260
//! Define __NBL_COMPILE_WITH_TAR_ARCHIVE_LOADER_ if you want to open TAR archives
8361
#define __NBL_COMPILE_WITH_TAR_ARCHIVE_LOADER_
84-
#ifdef NO__NBL_COMPILE_WITH_TAR_ARCHIVE_LOADER_
85-
#undef __NBL_COMPILE_WITH_TAR_ARCHIVE_LOADER_
86-
#endif
8762

8863
#define _NBL_FORMAT_VERSION 3
8964

0 commit comments

Comments
 (0)