Skip to content

Commit d16313c

Browse files
committed
irrlicht: fix patch
1 parent 364c45e commit d16313c

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

Patches/irrlicht/use-system-libs.patch

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@ WARNING: This patch contains a mix of CRLF and LF line endings.
33
--- a/include/IrrCompileConfig.h
44
+++ b/include/IrrCompileConfig.h
55
@@ -250,6 +250,7 @@ the engine will no longer read .jpeg images. */
6-
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
7-
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
8-
#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
9-
+#define NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
10-
#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
11-
#undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
12-
#endif
6+
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
7+
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
8+
#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
9+
+#define NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
10+
#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
11+
#undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
12+
#endif
1313
@@ -266,6 +267,7 @@ the engine will no longer read .png images. */
14-
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
15-
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
16-
#define _IRR_USE_NON_SYSTEM_LIB_PNG_
17-
+#define NO_IRR_USE_NON_SYSTEM_LIB_PNG_
18-
#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
19-
#undef _IRR_USE_NON_SYSTEM_LIB_PNG_
20-
#endif
14+
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
15+
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
16+
#define _IRR_USE_NON_SYSTEM_LIB_PNG_
17+
+#define NO_IRR_USE_NON_SYSTEM_LIB_PNG_
18+
#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
19+
#undef _IRR_USE_NON_SYSTEM_LIB_PNG_
20+
#endif
2121
@@ -603,6 +605,7 @@ ones. */
22-
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
23-
defined. */
24-
#define _IRR_USE_NON_SYSTEM_ZLIB_
25-
+#define NO_IRR_USE_NON_SYSTEM_ZLIB_
26-
#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
27-
#undef _IRR_USE_NON_SYSTEM_ZLIB_
28-
#endif
22+
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
23+
defined. */
24+
#define _IRR_USE_NON_SYSTEM_ZLIB_
25+
+#define NO_IRR_USE_NON_SYSTEM_ZLIB_
26+
#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
27+
#undef _IRR_USE_NON_SYSTEM_ZLIB_
28+
#endif
2929
@@ -624,6 +627,7 @@ library. */
30-
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
31-
defined. */
32-
#define _IRR_USE_NON_SYSTEM_BZLIB_
33-
+#define NO_IRR_USE_NON_SYSTEM_BZLIB_
34-
#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
35-
#undef _IRR_USE_NON_SYSTEM_BZLIB_
36-
#endif
30+
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
31+
defined. */
32+
#define _IRR_USE_NON_SYSTEM_BZLIB_
33+
+#define NO_IRR_USE_NON_SYSTEM_BZLIB_
34+
#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
35+
#undef _IRR_USE_NON_SYSTEM_BZLIB_
36+
#endif
3737
--- a/source/Irrlicht/CImageLoaderJPG.cpp
3838
+++ b/source/Irrlicht/CImageLoaderJPG.cpp
3939
@@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
40-
boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
41-
{
42-
// DO NOTHING
43-
- return 1;
44-
+ return TRUE;
45-
}
46-
47-
40+
boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
41+
{
42+
// DO NOTHING
43+
- return 1;
44+
+ return TRUE;
45+
}
46+
47+

0 commit comments

Comments
 (0)