Drop obsolete configuration macros

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index 5a4f8984ffc64db47b902eb4d4638a49178d9464..7536a849ea1e5593047a5a66504f182a00bdea74 100644 (file)
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -23,7 +23,7 @@
 \r
 //! Maximum number of texture an SMaterial can have, up to 8 are supported by Irrlicht.\r
 #define _IRR_MATERIAL_MAX_TEXTURES_ 4\r
-\r
+#define _IRR_COMPILE_WITH_GUI_\r
 \r
 #ifdef _WIN32\r
 #define IRRCALLCONV __stdcall\r
@@ -36,25 +36,6 @@
 #endif\r
 \r
 \r
-#define _IRR_COMPILE_WITH_GUI_\r
-#define _IRR_COMPILE_WITH_LIBJPEG_\r
-#define _IRR_COMPILE_WITH_LIBPNG_\r
-#define _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
-#define _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
-#define _IRR_COMPILE_WITH_B3D_LOADER_\r
-#define _IRR_COMPILE_WITH_X_LOADER_\r
-#define _IRR_COMPILE_WITH_OBJ_LOADER_\r
-#define _IRR_COMPILE_WITH_BMP_LOADER_\r
-#define _IRR_COMPILE_WITH_JPG_LOADER_\r
-#define _IRR_COMPILE_WITH_PNG_LOADER_\r
-#define _IRR_COMPILE_WITH_TGA_LOADER_\r
-#define _IRR_COMPILE_WITH_JPG_WRITER_\r
-#define _IRR_COMPILE_WITH_PNG_WRITER_\r
-#define __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
-#define _IRR_COMPILE_WITH_ZLIB_\r
-#define __IRR_HAS_S64\r
-\r
-\r
 #ifdef _DEBUG\r
        //! A few attributes are written in CSceneManager when _IRR_SCENEMANAGER_DEBUG is enabled\r
        // NOTE: Those attributes were used always until 1.8.0 and became a global define for 1.8.1\r

diff --git a/include/irrMath.h b/include/irrMath.h
index 994f8cd200b1ece5d74113a4a9cd452006e374d8..af00f44097f8d33ea5dc2fb2f31a251bbafd2433 100644 (file)
--- a/include/irrMath.h
+++ b/include/irrMath.h
@@ -21,9 +21,7 @@ namespace core
 \r
        const s32 ROUNDING_ERROR_S32 = 0;\r
 \r
-#ifdef __IRR_HAS_S64\r
        const s64 ROUNDING_ERROR_S64 = 0;\r
-#endif\r
        const f32 ROUNDING_ERROR_f32 = 0.000001f;\r
        const f64 ROUNDING_ERROR_f64 = 0.00000001;\r
 \r
@@ -186,7 +184,6 @@ namespace core
                return ROUNDING_ERROR_S32;\r
        }\r
 \r
-#ifdef __IRR_HAS_S64\r
        template <>\r
        inline s64 roundingError()\r
        {\r
@@ -198,7 +195,6 @@ namespace core
        {\r
                return ROUNDING_ERROR_S64;\r
        }\r
-#endif\r
 \r
        template <class T>\r
        inline T relativeErrorFactor()\r
@@ -310,13 +306,11 @@ namespace core
                return a <= tolerance;\r
        }\r
 \r
-#ifdef __IRR_HAS_S64\r
        //! returns if a equals zero, taking rounding errors into account\r
        inline bool iszero(const s64 a, const s64 tolerance = 0)\r
        {\r
                return abs_(a) <= tolerance;\r
        }\r
-#endif\r
 \r
        inline s32 s32_min(s32 a, s32 b)\r
        {\r
@@ -406,13 +400,11 @@ namespace core
                return static_cast<s32>(squareroot(static_cast<f32>(f)));\r
        }\r
 \r
-#ifdef __IRR_HAS_S64\r
        // calculate: sqrt ( x )\r
        REALINLINE s64 squareroot(const s64 f)\r
        {\r
                return static_cast<s64>(squareroot(static_cast<f64>(f)));\r
        }\r
-#endif\r
 \r
        // calculate: 1 / sqrt ( x )\r
        REALINLINE f64 reciprocal_squareroot(const f64 x)\r

diff --git a/include/irrTypes.h b/include/irrTypes.h
index e67b3958abe5da29ddecee4188ed30de10ba1495..eda3a21c70d851638fd7531d0f0fe952947f3016 100644 (file)
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -38,13 +38,11 @@ typedef uint32_t            u32;
 typedef int32_t                        s32;\r
 \r
 \r
-#ifdef __IRR_HAS_S64\r
 //! 64 bit unsigned variable.\r
 typedef uint64_t               u64;\r
 \r
 //! 64 bit signed variable.\r
 typedef int64_t                        s64;\r
-#endif // __IRR_HAS_S64\r
 \r
 \r
 \r

diff --git a/source/Irrlicht/BuiltInFont.h b/source/Irrlicht/BuiltInFont.h
index 467a49d1f36b7b1096d22dc5b82e43463745c450..be3a7f9312c3931bed5ecaf3b49bc7375cb5d524 100644 (file)
--- a/source/Irrlicht/BuiltInFont.h
+++ b/source/Irrlicht/BuiltInFont.h
@@ -6,7 +6,6 @@
 #define __BUILD_IN_FONT_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 // header file generated by Bin2H, copyright 2002 by N.Gebhardt.\r
 // Bin2H is Freeware. Download it freely from www.code3d.com.\r
@@ -16,7 +15,6 @@ namespace irr
 {\r
 namespace gui\r
 {\r
-#ifdef _IRR_COMPILE_WITH_BMP_LOADER_\r
 const u8 BuiltInFontData[] =\r
 {\r
        0x42, 0x4d, 0x4a, 0x20, 0x00, 0x00, 0x00, 0x00,\r
@@ -1056,20 +1054,7 @@ const u8 BuiltInFontData[] =
 };\r
 \r
        const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);\r
-\r
-#else // !defined(_IRR_COMPILE_WITH_BMP_LOADER_)\r
-\r
-       // built-in font cannot be loaded if there is no BMP loader\r
-\r
-       const u8 * const BuiltInFontData=0;\r
-\r
-       const u32 BuiltInFontDataSize = 0;\r
-\r
-#endif\r
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r

diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
index 9d92e03875c54c5eb31f7988b7e2370a64c2948f..cea8ef296d661e21302a22e02f95f7f4d0f01947 100644 (file)
--- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp
+++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp
@@ -7,7 +7,9 @@
 #include "ISceneManager.h"\r
 #include "S3DVertex.h"\r
 #include "os.h"\r
+#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
 #include "CSkinnedMesh.h"\r
+#endif\r
 #include "IDummyTransformationSceneNode.h"\r
 #include "IBoneSceneNode.h"\r
 #include "IMaterialRenderer.h"\r

diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp
index ca86a6a4326d70239336472b06ca2032e6c05c5a..83ec373656166bb9f97a30926858d4ae1f602828 100644 (file)
--- a/source/Irrlicht/CB3DMeshFileLoader.cpp
+++ b/source/Irrlicht/CB3DMeshFileLoader.cpp
@@ -7,8 +7,6 @@
 // declared public domain\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_B3D_LOADER_\r
-\r
 #include "CB3DMeshFileLoader.h"\r
 \r
 #include "IVideoDriver.h"\r
@@ -1055,7 +1053,3 @@ void CB3DMeshFileLoader::readFloats(f32* vec, u32 count)
 \r
 } // end namespace scene\r
 } // end namespace irr\r
-\r
-\r
-#endif // _IRR_COMPILE_WITH_B3D_LOADER_\r
-\r

diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp
index aaca16802041b69fbff741c58fb043b8174b2918..0b588fc0f41a9efffa03a9adc64a0bdac03dbc1e 100644 (file)
--- a/source/Irrlicht/CB3DMeshWriter.cpp
+++ b/source/Irrlicht/CB3DMeshWriter.cpp
@@ -6,8 +6,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_B3D_WRITER_\r
-\r
 #include "CB3DMeshWriter.h"\r
 #include "os.h"\r
 #include "ISkinnedMesh.h"\r
@@ -531,6 +529,3 @@ void CB3DMeshWriter::writeSizeFrom(io::IWriteFile* file, const u32 from, const u
 \r
 } // end namespace\r
 } // end namespace\r
-\r
-#endif // _IRR_COMPILE_WITH_B3D_WRITER_\r
-\r

diff --git a/source/Irrlicht/CBillboardSceneNode.cpp b/source/Irrlicht/CBillboardSceneNode.cpp
index a1464eb1aeb96a31dafae122f0a94fde3da0ad84..c297978e8c1fdf3850340b90f4f8af4e1e1c44cf 100644 (file)
--- a/source/Irrlicht/CBillboardSceneNode.cpp
+++ b/source/Irrlicht/CBillboardSceneNode.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
 #include "CBillboardSceneNode.h"\r
 #include "IVideoDriver.h"\r
 #include "ISceneManager.h"\r
@@ -281,5 +280,3 @@ ISceneNode* CBillboardSceneNode::clone(ISceneNode* newParent, ISceneManager* new
 \r
 } // end namespace scene\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r

diff --git a/source/Irrlicht/CBoneSceneNode.cpp b/source/Irrlicht/CBoneSceneNode.cpp
index 04ef8c7de2a96ff895e7b5b359a7f4f040a78894..4f05b842ec2e8095163c4af563afd6045aad3c6d 100644 (file)
--- a/source/Irrlicht/CBoneSceneNode.cpp
+++ b/source/Irrlicht/CBoneSceneNode.cpp
@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
-\r
 #include "CBoneSceneNode.h"\r
 \r
 namespace irr\r
@@ -98,6 +96,3 @@ void CBoneSceneNode::updateAbsolutePositionOfAllChildren()
 \r
 } // namespace scene\r
 } // namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index 45e8680c8591c9e05a77a55a2563e13393d7ea94..17ae7b33c1d6a94023910f0acc2e51fb5d652d7c 100644 (file)
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -54,9 +54,7 @@ CFileSystem::CFileSystem()
        //! reset current working directory\r
        getWorkingDirectory();\r
 \r
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
        ArchiveLoader.push_back(new CArchiveLoaderZIP(this));\r
-#endif\r
 \r
 }\r
 \r

diff --git a/source/Irrlicht/CGUIEnvironment.cpp b/source/Irrlicht/CGUIEnvironment.cpp
index 6d15706b9ecef53d25f71fc0885425d7f1e86382..8ad956deb929b1d52b7ce35595fa020e37414d39 100644 (file)
--- a/source/Irrlicht/CGUIEnvironment.cpp
+++ b/source/Irrlicht/CGUIEnvironment.cpp
@@ -25,8 +25,9 @@
 #include "CGUIComboBox.h"\r
 \r
 #include "IWriteFile.h"\r
-\r
+#ifdef IRR_ENABLE_BUILTIN_FONT\r
 #include "BuiltInFont.h"\r
+#endif\r
 #include "os.h"\r
 \r
 namespace irr\r
@@ -143,6 +144,7 @@ CGUIEnvironment::~CGUIEnvironment()
 \r
 void CGUIEnvironment::loadBuiltInFont()\r
 {\r
+#ifdef IRR_ENABLE_BUILTIN_FONT\r
        io::IReadFile* file = FileSystem->createMemoryReadFile(BuiltInFontData,\r
                                BuiltInFontDataSize, DefaultFontName, false);\r
 \r
@@ -161,6 +163,7 @@ void CGUIEnvironment::loadBuiltInFont()
        Fonts.push_back(f);\r
 \r
        file->drop();\r
+#endif\r
 }\r
 \r
 \r

diff --git a/source/Irrlicht/CImageLoaderBMP.cpp b/source/Irrlicht/CImageLoaderBMP.cpp
index 234c51578ebfdb51bf7eded140bd6110c1831599..a913101acd80535ef441dc4885a9319109ca6971 100644 (file)
--- a/source/Irrlicht/CImageLoaderBMP.cpp
+++ b/source/Irrlicht/CImageLoaderBMP.cpp
@@ -4,8 +4,6 @@
 \r
 #include "CImageLoaderBMP.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_BMP_LOADER_\r
-\r
 #include "IReadFile.h"\r
 #include "SColor.h"\r
 #include "CColorConverter.h"\r
@@ -371,6 +369,3 @@ IImageLoader* createImageLoaderBMP()
 \r
 } // end namespace video\r
 } // end namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h
index 5d993ce54014aaebb0348dbfceaf47eb6060f74a..6217f1b25224d9706c42ca8a3608933908ce4397 100644 (file)
--- a/source/Irrlicht/CImageLoaderBMP.h
+++ b/source/Irrlicht/CImageLoaderBMP.h
@@ -15,9 +15,6 @@ namespace irr
 namespace video\r
 {\r
 \r
-#if defined(_IRR_COMPILE_WITH_BMP_LOADER_) || defined(_IRR_COMPILE_WITH_BMP_WRITER_)\r
-\r
-\r
 // byte-align structures\r
 #include "irrpack.h"\r
 \r
@@ -59,10 +56,6 @@ namespace video
 // Default alignment\r
 #include "irrunpack.h"\r
 \r
-#endif // defined with loader or writer\r
-\r
-#ifdef _IRR_COMPILE_WITH_BMP_LOADER_\r
-\r
 /*!\r
        Surface Loader for Windows bitmaps\r
 */\r
@@ -91,10 +84,7 @@ private:
 };\r
 \r
 \r
-#endif // compiled with loader\r
-\r
 } // end namespace video\r
 } // end namespace irr\r
 \r
 #endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp
index 0d19d713868996564dfebc63c8719b852e32d710..c7b5df201ea5b2169be318bb25dcfb849e54b77c 100644 (file)
--- a/source/Irrlicht/CImageLoaderJPG.cpp
+++ b/source/Irrlicht/CImageLoaderJPG.cpp
@@ -4,8 +4,6 @@
 \r
 #include "CImageLoaderJPG.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_JPG_LOADER_\r
-\r
 #include "IReadFile.h"\r
 #include "CImage.h"\r
 #include "os.h"\r
@@ -40,21 +38,18 @@ bool CImageLoaderJPG::isALoadableFileExtension(const io::path& filename) const
        return core::hasFileExtension ( filename, "jpg", "jpeg" );\r
 }\r
 \r
+// struct for handling jpeg errors\r
+struct irr_jpeg_error_mgr\r
+{\r
+       // public jpeg error fields\r
+       struct jpeg_error_mgr pub;\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBJPEG_\r
-\r
-    // struct for handling jpeg errors\r
-    struct irr_jpeg_error_mgr\r
-    {\r
-        // public jpeg error fields\r
-        struct jpeg_error_mgr pub;\r
-\r
-        // for longjmp, to return to caller on a fatal error\r
-        jmp_buf setjmp_buffer;\r
+       // for longjmp, to return to caller on a fatal error\r
+       jmp_buf setjmp_buffer;\r
 \r
-        // for having access to the filename when printing the error messages\r
-        core::stringc* filename;\r
-    };\r
+       // for having access to the filename when printing the error messages\r
+       core::stringc* filename;\r
+};\r
 \r
 void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)\r
 {\r
@@ -116,31 +111,20 @@ void CImageLoaderJPG::output_message(j_common_ptr cinfo)
        errMsg += *myerr->filename;\r
        os::Printer::log(errMsg.c_str(),temp1, ELL_ERROR);\r
 }\r
-#endif // _IRR_COMPILE_WITH_LIBJPEG_\r
 \r
 //! returns true if the file maybe is able to be loaded by this class\r
 bool CImageLoaderJPG::isALoadableFileFormat(io::IReadFile* file) const\r
 {\r
-       #ifndef _IRR_COMPILE_WITH_LIBJPEG_\r
-       return false;\r
-       #else\r
-\r
        if (!(file && file->seek(0)))\r
                return false;\r
        unsigned char header[3];\r
        size_t headerLen = file->read(header, sizeof(header));\r
        return headerLen >= 3 && !memcmp(header, "\xFF\xD8\xFF", 3);\r
-       #endif\r
 }\r
 \r
 //! creates a surface from the file\r
 IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const\r
 {\r
-       #ifndef _IRR_COMPILE_WITH_LIBJPEG_\r
-       os::Printer::log("Can't load as not compiled with _IRR_COMPILE_WITH_LIBJPEG_:", file->getFileName(), ELL_DEBUG);\r
-       return 0;\r
-       #else\r
-\r
        if (!file)\r
                return 0;\r
 \r
@@ -288,8 +272,6 @@ IImage* CImageLoaderJPG::loadImage(io::IReadFile* file) const
        delete [] input;\r
 \r
        return image;\r
-\r
-       #endif\r
 }\r
 \r
 \r
@@ -302,6 +284,3 @@ IImageLoader* createImageLoaderJPG()
 \r
 } // end namespace video\r
 } // end namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h
index 146adbe8cc0656b97af9ae48e34dc3c345a27fd6..7e727a3874078d8e0bf3c467aac87ae068402255 100644 (file)
--- a/source/Irrlicht/CImageLoaderJPG.h
+++ b/source/Irrlicht/CImageLoaderJPG.h
@@ -7,17 +7,11 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_JPG_LOADER_\r
-\r
 #include "IImageLoader.h"\r
 \r
 #include <stdio.h> // required for jpeglib.h\r
-#ifdef _IRR_COMPILE_WITH_LIBJPEG_\r
-extern "C" {\r
-       #include <jpeglib.h> // use system lib\r
-       #include <setjmp.h>\r
-}\r
-#endif // _IRR_COMPILE_WITH_LIBJPEG_\r
+#include <jpeglib.h> // use system lib\r
+#include <setjmp.h>\r
 \r
 \r
 namespace irr\r
@@ -48,8 +42,6 @@ public:
        IImage* loadImage(io::IReadFile* file) const override;\r
 \r
 private:\r
-\r
-#ifdef _IRR_COMPILE_WITH_LIBJPEG_\r
        // several methods used via function pointers by jpeglib\r
 \r
        /* Receives control for a fatal error. Information sufficient to\r
@@ -95,8 +87,6 @@ private:
        /* Terminate source --- called by jpeg_finish_decompress() after all\r
        data has been read. Often a no-op. */\r
        static void term_source (j_decompress_ptr cinfo);\r
-\r
-       #endif // _IRR_COMPILE_WITH_LIBJPEG_\r
 };\r
 \r
 \r
@@ -105,5 +95,3 @@ private:
 \r
 \r
 #endif\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderPNG.cpp b/source/Irrlicht/CImageLoaderPNG.cpp
index b46801733714ff95e562ada6d3534ddd8ca86868..59709bfb788440b695c4e60dd3d25d93d4c8356d 100644 (file)
--- a/source/Irrlicht/CImageLoaderPNG.cpp
+++ b/source/Irrlicht/CImageLoaderPNG.cpp
@@ -4,11 +4,7 @@
 \r
 #include "CImageLoaderPNG.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_PNG_LOADER_\r
-\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
-       #include <png.h> // use system lib png\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
+#include <png.h> // use system lib png\r
 \r
 #include "CImage.h"\r
 #include "CReadFile.h"\r
@@ -19,7 +15,6 @@ namespace irr
 namespace video\r
 {\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
 // PNG function for error handling\r
 static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)\r
 {\r
@@ -46,25 +41,19 @@ void PNGAPI user_read_data_fcn(png_structp png_ptr, png_bytep data, png_size_t l
        if (check != length)\r
                png_error(png_ptr, "Read Error");\r
 }\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 \r
 \r
 //! returns true if the file maybe is able to be loaded by this class\r
 //! based on the file extension (e.g. ".tga")\r
 bool CImageLoaderPng::isALoadableFileExtension(const io::path& filename) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        return core::hasFileExtension ( filename, "png" );\r
-#else\r
-       return false;\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 }\r
 \r
 \r
 //! returns true if the file maybe is able to be loaded by this class\r
 bool CImageLoaderPng::isALoadableFileFormat(io::IReadFile* file) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        if (!file)\r
                return false;\r
 \r
@@ -75,16 +64,12 @@ bool CImageLoaderPng::isALoadableFileFormat(io::IReadFile* file) const
 \r
        // Check if it really is a PNG file\r
        return !png_sig_cmp(buffer, 0, 8);\r
-#else\r
-       return false;\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 }\r
 \r
 \r
 // load in the image data\r
 IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        if (!file)\r
                return 0;\r
 \r
@@ -267,9 +252,6 @@ IImage* CImageLoaderPng::loadImage(io::IReadFile* file) const
        png_destroy_read_struct(&png_ptr,&info_ptr, 0); // Clean up memory\r
 \r
        return image;\r
-#else\r
-       return 0;\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 }\r
 \r
 \r
@@ -281,6 +263,3 @@ IImageLoader* createImageLoaderPNG()
 \r
 }// end namespace irr\r
 }//end namespace video\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderPNG.h b/source/Irrlicht/CImageLoaderPNG.h
index 6e631b7269de1bb1f91a51c2438222227ab5c5f1..ed135db9e3d15d0c30e5e920174537d8f516466c 100644 (file)
--- a/source/Irrlicht/CImageLoaderPNG.h
+++ b/source/Irrlicht/CImageLoaderPNG.h
@@ -11,8 +11,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_PNG_LOADER_\r
-\r
 #include "IImageLoader.h"\r
 \r
 namespace irr\r
@@ -41,5 +39,3 @@ public:
 } // end namespace irr\r
 \r
 #endif\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderTGA.cpp b/source/Irrlicht/CImageLoaderTGA.cpp
index af4fad55dc43805e269d826a4137486e29c034b8..3286bddd6c89415a11fca28e3c4db89ef536d7fd 100644 (file)
--- a/source/Irrlicht/CImageLoaderTGA.cpp
+++ b/source/Irrlicht/CImageLoaderTGA.cpp
@@ -4,8 +4,6 @@
 \r
 #include "CImageLoaderTGA.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_TGA_LOADER_\r
-\r
 #include "IReadFile.h"\r
 #include "os.h"\r
 #include "CColorConverter.h"\r
@@ -238,6 +236,3 @@ IImageLoader* createImageLoaderTGA()
 \r
 } // end namespace video\r
 } // end namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageLoaderTGA.h b/source/Irrlicht/CImageLoaderTGA.h
index d8f7368b734b4f4cd3327b752af942ba60a2728d..f31c682522d3bf424b64bdd0d03c480e8748fa1d 100644 (file)
--- a/source/Irrlicht/CImageLoaderTGA.h
+++ b/source/Irrlicht/CImageLoaderTGA.h
@@ -15,8 +15,6 @@ namespace irr
 namespace video\r
 {\r
 \r
-#if defined(_IRR_COMPILE_WITH_TGA_LOADER_) || defined(_IRR_COMPILE_WITH_TGA_WRITER_)\r
-\r
 // byte-align structures\r
 #include "irrpack.h"\r
 \r
@@ -46,10 +44,6 @@ namespace video
 // Default alignment\r
 #include "irrunpack.h"\r
 \r
-#endif // compiled with loader or reader\r
-\r
-#ifdef _IRR_COMPILE_WITH_TGA_LOADER_\r
-\r
 /*!\r
        Surface Loader for targa images\r
 */\r
@@ -73,10 +67,7 @@ private:
        u8* loadCompressedImage(io::IReadFile *file, const STGAHeader& header) const;\r
 };\r
 \r
-#endif // compiled with loader\r
-\r
 } // end namespace video\r
 } // end namespace irr\r
 \r
 #endif\r
-\r

diff --git a/source/Irrlicht/CImageWriterJPG.cpp b/source/Irrlicht/CImageWriterJPG.cpp
index 97a64b849bd5ab698df51fef5599d2ab0d163089..1fb9fb37c97bcaa23f91e7fc9f35424f446dda9c 100644 (file)
--- a/source/Irrlicht/CImageWriterJPG.cpp
+++ b/source/Irrlicht/CImageWriterJPG.cpp
@@ -4,15 +4,12 @@
 \r
 #include "CImageWriterJPG.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_JPG_WRITER_\r
-\r
 #include "CColorConverter.h"\r
 #include "IWriteFile.h"\r
 #include "CImage.h"\r
 #include "irrString.h"\r
 #include "os.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBJPEG_\r
 #include <stdio.h> // required for jpeglib.h\r
 extern "C"\r
 {\r
@@ -181,7 +178,7 @@ static bool writeJPEGFile(io::IWriteFile* file, IImage* image, u32 quality)
 } // namespace video\r
 } // namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_LIBJPEG_\r
+\r
 \r
 namespace irr\r
 {\r
@@ -209,15 +206,8 @@ bool CImageWriterJPG::isAWriteableFileExtension(const io::path& filename) const
 \r
 bool CImageWriterJPG::writeImage(io::IWriteFile *file, IImage *image, u32 quality) const\r
 {\r
-#ifndef _IRR_COMPILE_WITH_LIBJPEG_\r
-       return false;\r
-#else\r
        return writeJPEGFile(file, image, quality);\r
-#endif\r
 }\r
 \r
 } // namespace video\r
 } // namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageWriterJPG.h b/source/Irrlicht/CImageWriterJPG.h
index ec8a1b85c8d2269a1c702e4fcbc96acfa04276bd..facf67d2e809dd3e81fcf15b29607c73f58cc49d 100644 (file)
--- a/source/Irrlicht/CImageWriterJPG.h
+++ b/source/Irrlicht/CImageWriterJPG.h
@@ -7,8 +7,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_JPG_WRITER_\r
-\r
 #include "IImageWriter.h"\r
 \r
 namespace irr\r
@@ -33,5 +31,3 @@ public:
 }\r
 \r
 #endif // _C_IMAGE_WRITER_JPG_H_INCLUDED__\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageWriterPNG.cpp b/source/Irrlicht/CImageWriterPNG.cpp
index 55ae00ec5b31a73cd323bc37e8a9f599d502740b..0e2a71ecf77f39267206319a9e87ebb63b527f1b 100644 (file)
--- a/source/Irrlicht/CImageWriterPNG.cpp
+++ b/source/Irrlicht/CImageWriterPNG.cpp
@@ -4,17 +4,13 @@
 \r
 #include "CImageWriterPNG.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_PNG_WRITER_\r
-\r
 #include "CImageLoaderPNG.h"\r
 #include "CColorConverter.h"\r
 #include "IWriteFile.h"\r
 #include "irrString.h"\r
 #include "os.h" // for logging\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
-       #include <png.h> // use system lib png\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
+#include <png.h> // use system lib png\r
 \r
 namespace irr\r
 {\r
@@ -26,7 +22,6 @@ IImageWriter* createImageWriterPNG()
        return new CImageWriterPNG;\r
 }\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
 // PNG function for error handling\r
 static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)\r
 {\r
@@ -51,7 +46,6 @@ void PNGAPI user_write_data_fcn(png_structp png_ptr, png_bytep data, png_size_t
        if (check != length)\r
                png_error(png_ptr, "Write Error");\r
 }\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 \r
 CImageWriterPNG::CImageWriterPNG()\r
 {\r
@@ -62,16 +56,11 @@ CImageWriterPNG::CImageWriterPNG()
 \r
 bool CImageWriterPNG::isAWriteableFileExtension(const io::path& filename) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        return core::hasFileExtension ( filename, "png" );\r
-#else\r
-       return false;\r
-#endif\r
 }\r
 \r
 bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        if (!file || !image)\r
                return false;\r
 \r
@@ -206,13 +195,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
        delete [] tmpImage;\r
        png_destroy_write_struct(&png_ptr, &info_ptr);\r
        return true;\r
-#else\r
-       return false;\r
-#endif\r
 }\r
 \r
 } // namespace video\r
 } // namespace irr\r
-\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CImageWriterPNG.h b/source/Irrlicht/CImageWriterPNG.h
index eec12ff048c66af134303529f555408394a783a1..4d6619f5cbdef40f5ae89ab2d0376a943a69d396 100644 (file)
--- a/source/Irrlicht/CImageWriterPNG.h
+++ b/source/Irrlicht/CImageWriterPNG.h
@@ -7,8 +7,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_PNG_WRITER_\r
-\r
 #include "IImageWriter.h"\r
 \r
 namespace irr\r
@@ -33,5 +31,3 @@ public:
 } // namespace irr\r
 \r
 #endif // _C_IMAGE_WRITER_PNG_H_INCLUDED__\r
-#endif\r
-\r

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index eeb1029a27c89cf3cf274b80df6ccaf256136da9..7b511455aea91fe79fb700fe07366c20a7107b9b 100644 (file)
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@ -63,6 +63,12 @@ if(NOT REVISION_SANITY_CHECK)
        message(FATAL_ERROR "IrrlichtMt revision number mismatches between CMake and headers.")
 endif()
 
+# Platform-independent configuration (hard-coded currently)
+add_definitions(
+       -DIRR_ENABLE_BUILTIN_FONT
+       -D_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_
+       )
+
 # Platform-specific configuration
 
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")

diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index 775a22c952fb99398e32bf8e8ba00e89da8c4bf8..5834e01caba97a8cb9dcba37ae6bf44c756349f9 100644 (file)
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -32,57 +32,15 @@ IImageLoader* createImageLoaderJPG();
 //! creates a loader which is able to load targa images\r
 IImageLoader* createImageLoaderTGA();\r
 \r
-//! creates a loader which is able to load psd images\r
-IImageLoader* createImageLoaderPSD();\r
-\r
-//! creates a loader which is able to load psd images\r
-IImageLoader* createImageLoaderPVR();\r
-\r
-//! creates a loader which is able to load dds images\r
-IImageLoader* createImageLoaderDDS();\r
-\r
-//! creates a loader which is able to load pcx images\r
-IImageLoader* createImageLoaderPCX();\r
-\r
 //! creates a loader which is able to load png images\r
 IImageLoader* createImageLoaderPNG();\r
 \r
-//! creates a loader which is able to load WAL images\r
-IImageLoader* createImageLoaderWAL();\r
-\r
-//! creates a loader which is able to load halflife images\r
-IImageLoader* createImageLoaderHalfLife();\r
-\r
-//! creates a loader which is able to load lmp images\r
-IImageLoader* createImageLoaderLMP();\r
-\r
-//! creates a loader which is able to load ppm/pgm/pbm images\r
-IImageLoader* createImageLoaderPPM();\r
-\r
-//! creates a loader which is able to load rgb images\r
-IImageLoader* createImageLoaderRGB();\r
-\r
-\r
-//! creates a writer which is able to save bmp images\r
-IImageWriter* createImageWriterBMP();\r
-\r
 //! creates a writer which is able to save jpg images\r
 IImageWriter* createImageWriterJPG();\r
 \r
-//! creates a writer which is able to save tga images\r
-IImageWriter* createImageWriterTGA();\r
-\r
-//! creates a writer which is able to save psd images\r
-IImageWriter* createImageWriterPSD();\r
-\r
-//! creates a writer which is able to save pcx images\r
-IImageWriter* createImageWriterPCX();\r
-\r
 //! creates a writer which is able to save png images\r
 IImageWriter* createImageWriterPNG();\r
 \r
-//! creates a writer which is able to save ppm images\r
-IImageWriter* createImageWriterPPM();\r
 \r
 //! constructor\r
 CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& screenSize)\r
@@ -124,68 +82,14 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& scre
        if (FileSystem)\r
                FileSystem->grab();\r
 \r
-       // create surface loader\r
-\r
-#ifdef _IRR_COMPILE_WITH_WAL_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderHalfLife());\r
-       SurfaceLoader.push_back(video::createImageLoaderWAL());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_LMP_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderLMP());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PPM_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderPPM());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_RGB_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderRGB());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PSD_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderPSD());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PVR_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderPVR());\r
-#endif\r
-#if defined(_IRR_COMPILE_WITH_DDS_LOADER_) || defined(_IRR_COMPILE_WITH_DDS_DECODER_LOADER_)\r
-       SurfaceLoader.push_back(video::createImageLoaderDDS());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PCX_LOADER_\r
-       SurfaceLoader.push_back(video::createImageLoaderPCX());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_TGA_LOADER_\r
+       // create surface loaders and writers\r
        SurfaceLoader.push_back(video::createImageLoaderTGA());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PNG_LOADER_\r
        SurfaceLoader.push_back(video::createImageLoaderPNG());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_JPG_LOADER_\r
        SurfaceLoader.push_back(video::createImageLoaderJPG());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_BMP_LOADER_\r
        SurfaceLoader.push_back(video::createImageLoaderBMP());\r
-#endif\r
-\r
-\r
-#ifdef _IRR_COMPILE_WITH_PPM_WRITER_\r
-       SurfaceWriter.push_back(video::createImageWriterPPM());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PCX_WRITER_\r
-       SurfaceWriter.push_back(video::createImageWriterPCX());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PSD_WRITER_\r
-       SurfaceWriter.push_back(video::createImageWriterPSD());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_TGA_WRITER_\r
-       SurfaceWriter.push_back(video::createImageWriterTGA());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_JPG_WRITER_\r
+\r
        SurfaceWriter.push_back(video::createImageWriterJPG());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_PNG_WRITER_\r
        SurfaceWriter.push_back(video::createImageWriterPNG());\r
-#endif\r
-#ifdef _IRR_COMPILE_WITH_BMP_WRITER_\r
-       SurfaceWriter.push_back(video::createImageWriterBMP());\r
-#endif\r
 \r
 \r
        // set ExposedData to 0\r

diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp
index c4fee234da93cebc8578b1575e98abeb65d7d5f1..11fa484ab3d4e6f251f9ae8d3c3fa972dcaf01cd 100644 (file)
--- a/source/Irrlicht/COBJMeshFileLoader.cpp
+++ b/source/Irrlicht/COBJMeshFileLoader.cpp
@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_\r
-\r
 #include "COBJMeshFileLoader.h"\r
 #include "IMeshManipulator.h"\r
 #include "IVideoDriver.h"\r
@@ -612,6 +610,3 @@ void COBJMeshFileLoader::cleanUp()
 \r
 } // end namespace scene\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_OBJ_LOADER_\r
-\r

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 664e672d082100eba18c5b99516c9609752a1b95..b664c7720a7110c2c350a65bce4d9035da15c911 100644 (file)
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -15,27 +15,11 @@
 \r
 #include "os.h"\r
 \r
-// We need this include for the case of skinned mesh support without\r
-// any such loader\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
 #include "CSkinnedMesh.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_X_LOADER_\r
 #include "CXMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_\r
 #include "COBJMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_B3D_LOADER_\r
 #include "CB3DMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
 #include "CBillboardSceneNode.h"\r
-#endif // _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
 #include "CAnimatedMeshSceneNode.h"\r
 #include "CCameraSceneNode.h"\r
 #include "CMeshSceneNode.h"\r
@@ -96,15 +80,9 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
        // TODO: now that we have multiple scene managers, these should be\r
        // shallow copies from the previous manager if there is one.\r
 \r
-       #ifdef _IRR_COMPILE_WITH_X_LOADER_\r
        MeshLoaderList.push_back(new CXMeshFileLoader(this, FileSystem));\r
-       #endif\r
-       #ifdef _IRR_COMPILE_WITH_OBJ_LOADER_\r
        MeshLoaderList.push_back(new COBJMeshFileLoader(this, FileSystem));\r
-       #endif\r
-       #ifdef _IRR_COMPILE_WITH_B3D_LOADER_\r
        MeshLoaderList.push_back(new CB3DMeshFileLoader(this));\r
-       #endif\r
 }\r
 \r
 \r
@@ -316,7 +294,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
        video::SColor colorTop, video::SColor colorBottom\r
        )\r
 {\r
-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
        if (!parent)\r
                parent = this;\r
 \r
@@ -325,9 +302,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
        node->drop();\r
 \r
        return node;\r
-#else\r
-       return 0;\r
-#endif\r
 }\r
 \r
 \r
@@ -971,49 +945,12 @@ const video::SColorf& CSceneManager::getAmbientLight() const
 //! Get a skinned mesh, which is not available as header-only code\r
 ISkinnedMesh* CSceneManager::createSkinnedMesh()\r
 {\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
        return new CSkinnedMesh();\r
-#else\r
-       return 0;\r
-#endif\r
 }\r
 \r
 //! Returns a mesh writer implementation if available\r
 IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)\r
 {\r
-       switch(type)\r
-       {\r
-       case EMWT_IRR_MESH:\r
-       case EMWT_COLLADA:\r
-               return 0;\r
-       case EMWT_STL:\r
-#ifdef _IRR_COMPILE_WITH_STL_WRITER_\r
-               return new CSTLMeshWriter(this);\r
-#else\r
-               return 0;\r
-#endif\r
-       case EMWT_OBJ:\r
-#ifdef _IRR_COMPILE_WITH_OBJ_WRITER_\r
-               return new COBJMeshWriter(this, FileSystem);\r
-#else\r
-               return 0;\r
-#endif\r
-\r
-       case EMWT_PLY:\r
-#ifdef _IRR_COMPILE_WITH_PLY_WRITER_\r
-               return new CPLYMeshWriter();\r
-#else\r
-               return 0;\r
-#endif\r
-\r
-       case EMWT_B3D:\r
-#ifdef _IRR_COMPILE_WITH_B3D_WRITER_\r
-               return new CB3DMeshWriter();\r
-#else\r
-               return 0;\r
-#endif\r
-       }\r
-\r
        return 0;\r
 }\r
 \r

diff --git a/source/Irrlicht/CSkinnedMesh.cpp b/source/Irrlicht/CSkinnedMesh.cpp
index 9f47f3b68a6663c54d10acd5e842a41ae7b65eb3..5e01e060967b380b9ad4f22d5680de1aff8316c1 100644 (file)
--- a/source/Irrlicht/CSkinnedMesh.cpp
+++ b/source/Irrlicht/CSkinnedMesh.cpp
@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
-\r
 #include "CSkinnedMesh.h"\r
 #include "CBoneSceneNode.h"\r
 #include "IAnimatedMeshSceneNode.h"\r
@@ -1539,6 +1537,3 @@ void CSkinnedMesh::calculateTangents(
 \r
 } // end namespace scene\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
-\r

diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index 2de099feef51689447d9fc492770f419bff58a0d..dfeefd3309a1fd5f5d4d5528dfd5bff9717545c9 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -4,8 +4,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_X_LOADER_\r
-\r
 #include "CXMeshFileLoader.h"\r
 #include "os.h"\r
 \r
@@ -2359,6 +2357,3 @@ bool CXMeshFileLoader::readMatrix(core::matrix4& mat)
 \r
 } // end namespace scene\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_X_LOADER_\r
-\r

diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp
index d394313d9853c79de57627f93d29099f65f87da9..500db9008dd35d0d711fbb3a408a500db0519cec 100644 (file)
--- a/source/Irrlicht/CZipReader.cpp
+++ b/source/Irrlicht/CZipReader.cpp
@@ -7,16 +7,12 @@
 #include "os.h"\r
 \r
 \r
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
-\r
 #include "CFileList.h"\r
 #include "CReadFile.h"\r
 #include "coreutil.h"\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_ZLIB_\r
-       #include <zlib.h> // use system lib\r
-#endif\r
+#include <zlib.h> // use system lib\r
 \r
 namespace irr\r
 {\r
@@ -464,8 +460,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
                }\r
        case 8:\r
                {\r
-                       #ifdef _IRR_COMPILE_WITH_ZLIB_\r
-\r
                        const u32 uncompressedSize = e.header.DataDescriptor.UncompressedSize;\r
                        c8* pBuf = new c8[ uncompressedSize ];\r
                        if (!pBuf)\r
@@ -531,10 +525,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
                        }\r
                        else\r
                                return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);\r
-\r
-                       #else\r
-                       return 0; // zlib not compiled, we cannot decompress the data.\r
-                       #endif\r
                }\r
        case 12:\r
                {\r
@@ -560,5 +550,3 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 \r
 } // end namespace io\r
 } // end namespace irr\r
-\r
-#endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r

diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h
index 458b6db4093a5806c9f57971e91273dbc99c2ab8..02de98fb262abca1567d34eccb7dde2e0f6efb07 100644 (file)
--- a/source/Irrlicht/CZipReader.h
+++ b/source/Irrlicht/CZipReader.h
@@ -7,8 +7,6 @@
 \r
 #include "IrrCompileConfig.h"\r
 \r
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
-\r
 #include "IReadFile.h"\r
 #include "irrArray.h"\r
 #include "irrString.h"\r
@@ -226,6 +224,4 @@ namespace io
 } // end namespace io\r
 } // end namespace irr\r
 \r
-#endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
 #endif // __C_ZIP_READER_H_INCLUDED__\r
-\r