1 --- irrlicht-1.8/include/IrrCompileConfig.h.orig 2013-07-14 09:21:14.764048838 +0200
2 +++ irrlicht-1.8/include/IrrCompileConfig.h 2013-07-14 09:25:40.837371005 +0200
4 //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
5 /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
6 This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
7 -#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
8 +//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
9 #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
10 #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
13 //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
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 _IRR_USE_NON_SYSTEM_LIB_PNG_
18 #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
19 #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
22 /** If this is commented out, Irrlicht will try to compile using the zlib
23 installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
25 -#define _IRR_USE_NON_SYSTEM_ZLIB_
26 +//#define _IRR_USE_NON_SYSTEM_ZLIB_
27 #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
28 #undef _IRR_USE_NON_SYSTEM_ZLIB_
31 /** If this is commented out, Irrlicht will try to compile using the bzlib
32 installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
34 -#define _IRR_USE_NON_SYSTEM_BZLIB_
35 +//#define _IRR_USE_NON_SYSTEM_BZLIB_
36 #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
37 #undef _IRR_USE_NON_SYSTEM_BZLIB_
39 --- irrlicht-1.8.5/source/Irrlicht/Makefile.orig 2022-02-08 17:13:44.515555324 +0100
40 +++ irrlicht-1.8.5/source/Irrlicht/Makefile 2022-02-08 17:14:55.105885066 +0100
41 @@ -48,18 +48,14 @@ IRRSWRENDEROBJ = CSoftwareDriver.o CSoft
42 IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
43 IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
44 IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
45 -ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
46 -JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
47 -LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
48 LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
49 -BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
51 # Next variable is for additional scene nodes etc. of customized Irrlicht versions
53 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
54 $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
55 - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
56 - $(BZIP2OBJ) $(EXTRAOBJ)
57 + $(IRRGUIOBJ) $(LIBAESGM) \