Drop _IRR_COMPILE_WITH_GUI_

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index 7536a849ea1e5593047a5a66504f182a00bdea74..0259399c132e4610ea7d211cca677ad1f7b8fede 100644 (file)
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -23,7 +23,6 @@
 \r
 //! Maximum number of texture an SMaterial can have, up to 8 are supported by Irrlicht.\r
 #define _IRR_MATERIAL_MAX_TEXTURES_ 4\r
-#define _IRR_COMPILE_WITH_GUI_\r
 \r
 #ifdef _WIN32\r
 #define IRRCALLCONV __stdcall\r

diff --git a/source/Irrlicht/CGUIButton.cpp b/source/Irrlicht/CGUIButton.cpp
index 704fd3d2c52b878d592ee311edd53cd5b5052f8d..d6ab543d2d74f382739486ddb1443b4d86136256 100644 (file)
--- a/source/Irrlicht/CGUIButton.cpp
+++ b/source/Irrlicht/CGUIButton.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIButton.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -558,6 +557,3 @@ bool CGUIButton::isDrawingBorder() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h
index 9bd861223f61187cf569198062e0c550afffe1fa..6c718b1a7334a8005aa37dc006f992869359d4fe 100644 (file)
--- a/source/Irrlicht/CGUIButton.h
+++ b/source/Irrlicht/CGUIButton.h
@@ -6,8 +6,6 @@
 #define __C_GUI_BUTTON_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIButton.h"\r
 #include "IGUISpriteBank.h"\r
 #include "ITexture.h"\r
@@ -244,7 +242,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_BUTTON_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUICheckBox.cpp b/source/Irrlicht/CGUICheckBox.cpp
index 48ec5e8ae9797a33cfba9b14380d364521bc1130..6c5271ff0b74a5d3971ea2bf1d22760afc1b3973 100644 (file)
--- a/source/Irrlicht/CGUICheckBox.cpp
+++ b/source/Irrlicht/CGUICheckBox.cpp
@@ -4,8 +4,6 @@
 \r
 #include "CGUICheckBox.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
 #include "IVideoDriver.h"\r
@@ -227,6 +225,3 @@ bool CGUICheckBox::isDrawBorderEnabled() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h
index adb46b4197bdfd05a9ac9c94b18fb9e6f9b3ac63..facbfb0558c46f78b802a07db87363016e178f01 100644 (file)
--- a/source/Irrlicht/CGUICheckBox.h
+++ b/source/Irrlicht/CGUICheckBox.h
@@ -6,8 +6,6 @@
 #define __C_GUI_CHECKBOX_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUICheckBox.h"\r
 \r
 namespace irr\r
@@ -61,5 +59,3 @@ namespace gui
 } // end namespace irr\r
 \r
 #endif // __C_GUI_CHECKBOX_H_INCLUDED__\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r

diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp
index b35b47a6658bdd3455fa4c6484c68b9cc3886656..ecd3a9c27873a9348c380fd244a3eb339b83c0ad 100644 (file)
--- a/source/Irrlicht/CGUIComboBox.cpp
+++ b/source/Irrlicht/CGUIComboBox.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIComboBox.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUIEnvironment.h"\r
 #include "IVideoDriver.h"\r
@@ -488,7 +487,3 @@ void CGUIComboBox::openCloseMenu()
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h
index dbdae41b191fdd5ee801b73dbbd1f4854ed0ee22..13996f0da5ae64d6dd4bf2f22a9a4f7563863e1f 100644 (file)
--- a/source/Irrlicht/CGUIComboBox.h
+++ b/source/Irrlicht/CGUIComboBox.h
@@ -6,8 +6,6 @@
 #define __C_GUI_COMBO_BOX_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIComboBox.h"\r
 #include "IGUIStaticText.h"\r
 #include "irrString.h"\r
@@ -107,7 +105,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_COMBO_BOX_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp
index a3851e60727bb38de56fdcc0c5881a44896f076f..cf4b64eec5d07f3a85bb14a0bb38f50b0dc44a25 100644 (file)
--- a/source/Irrlicht/CGUIEditBox.cpp
+++ b/source/Irrlicht/CGUIEditBox.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIEditBox.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -1652,6 +1651,3 @@ bool CGUIEditBox::acceptsIME()
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h
index b0b5070643e22c5be641c51156bcf160573ced8f..0626fec499e9e578acfbac0f049fedb5a8b5d26c 100644 (file)
--- a/source/Irrlicht/CGUIEditBox.h
+++ b/source/Irrlicht/CGUIEditBox.h
@@ -6,8 +6,6 @@
 #define __C_GUI_EDIT_BOX_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIEditBox.h"\r
 #include "irrArray.h"\r
 #include "IOSOperator.h"\r
@@ -201,6 +199,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
 #endif // __C_GUI_EDIT_BOX_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUIEnvironment.cpp b/source/Irrlicht/CGUIEnvironment.cpp
index 8ad956deb929b1d52b7ce35595fa020e37414d39..a7b280427c01d9b44289944f694301627579e09b 100644 (file)
--- a/source/Irrlicht/CGUIEnvironment.cpp
+++ b/source/Irrlicht/CGUIEnvironment.cpp
@@ -5,8 +5,6 @@
 \r
 #include "CGUIEnvironment.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IVideoDriver.h"\r
 \r
 #include "CGUISkin.h"\r
@@ -1110,6 +1108,3 @@ IGUIEnvironment* createGUIEnvironment(io::IFileSystem* fs,
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h
index ab745865b66dfd72250620113bc51c23e35ab1c3..2a6097c06afc2bce106174c243a46430c6b0571d 100644 (file)
--- a/source/Irrlicht/CGUIEnvironment.h
+++ b/source/Irrlicht/CGUIEnvironment.h
@@ -6,8 +6,6 @@
 #define __C_GUI_ENVIRONMENT_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIEnvironment.h"\r
 #include "IGUIElement.h"\r
 #include "irrArray.h"\r
@@ -231,8 +229,4 @@ private:
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_ENVIRONMENT_H_INCLUDED__\r
-\r
-\r

diff --git a/source/Irrlicht/CGUIFileOpenDialog.cpp b/source/Irrlicht/CGUIFileOpenDialog.cpp
index 6599bef5520c7484202592700c9e6aa7305a407b..e68d7cda6055d569e6e0d9e575902ac419ec5467 100644 (file)
--- a/source/Irrlicht/CGUIFileOpenDialog.cpp
+++ b/source/Irrlicht/CGUIFileOpenDialog.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIFileOpenDialog.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -411,5 +410,3 @@ void CGUIFileOpenDialog::sendCancelEvent()
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r

diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h
index 55b9ffa7ed4bf2aa9953faaed5caccbf10245e37..c51f60498f5b4ac763c96af2c276c1cb45cceb50 100644 (file)
--- a/source/Irrlicht/CGUIFileOpenDialog.h
+++ b/source/Irrlicht/CGUIFileOpenDialog.h
@@ -6,8 +6,6 @@
 #define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIFileOpenDialog.h"\r
 #include "IGUIButton.h"\r
 #include "IGUIListBox.h"\r
@@ -90,7 +88,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp
index 1becf67570886eb2d5ed77b6308fdb14e74e20c6..b7b6ed754f8b5fd256e3efc2aa0396b02d711f45 100644 (file)
--- a/source/Irrlicht/CGUIFont.cpp
+++ b/source/Irrlicht/CGUIFont.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIFont.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "os.h"\r
 #include "coreutil.h"\r
@@ -594,6 +593,3 @@ IGUISpriteBank* CGUIFont::getSpriteBank() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h
index 4cf93b8971590f9b479d49f5e5dff0742056e427..c7b93374d2789afdf155927e3ad7c8c2816d3cf6 100644 (file)
--- a/source/Irrlicht/CGUIFont.h
+++ b/source/Irrlicht/CGUIFont.h
@@ -6,8 +6,6 @@
 #define __C_GUI_FONT_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIFontBitmap.h"\r
 #include "irrString.h"\r
 #include "IReadFile.h"\r
@@ -111,7 +109,4 @@ private:
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_FONT_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUIImage.cpp b/source/Irrlicht/CGUIImage.cpp
index 2d2a08cbf5c4eb1d6cf98d7ddae5c0c31da1a70f..669428b9e9968a327d50420c8732a7d57fc9a2a6 100644 (file)
--- a/source/Irrlicht/CGUIImage.cpp
+++ b/source/Irrlicht/CGUIImage.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIImage.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -177,7 +176,3 @@ core::rect<f32> CGUIImage::getDrawBounds() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h
index 581fe1b5f685d7437ba7d1cf7eb844663c6b8333..37d0abc6b640d2cb8a23320862185dc5ba9e9507 100644 (file)
--- a/source/Irrlicht/CGUIImage.h
+++ b/source/Irrlicht/CGUIImage.h
@@ -6,8 +6,6 @@
 #define __C_GUI_IMAGE_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIImage.h"\r
 \r
 namespace irr\r
@@ -102,6 +100,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_IMAGE_H_INCLUDED__\r

diff --git a/source/Irrlicht/CGUIListBox.cpp b/source/Irrlicht/CGUIListBox.cpp
index f6f0e778fb3434de2f08a56de71148638d0e5103..b00c7e3892ebdb642aa01c5d3aca00307e380831 100644 (file)
--- a/source/Irrlicht/CGUIListBox.cpp
+++ b/source/Irrlicht/CGUIListBox.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIListBox.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "CGUIListBox.h"\r
 #include "IGUISkin.h"\r
@@ -841,6 +840,3 @@ IGUIScrollBar* CGUIListBox::getVerticalScrollBar() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h
index 8e1566d6c6fd357e87df96a48f4c5ed4a84b8587..a615ed4e38e40eaca12ef534815852bef2be74f5 100644 (file)
--- a/source/Irrlicht/CGUIListBox.h
+++ b/source/Irrlicht/CGUIListBox.h
@@ -6,8 +6,6 @@
 #define __C_GUI_LIST_BOX_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIListBox.h"\r
 #include "irrArray.h"\r
 \r
@@ -178,6 +176,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r

diff --git a/source/Irrlicht/CGUIScrollBar.cpp b/source/Irrlicht/CGUIScrollBar.cpp
index 6d6d36754b8401cc1c1e3efba6523b97b18ee009..567251c64eb565134f3f6afcd08a5cf96a6b2070 100644 (file)
--- a/source/Irrlicht/CGUIScrollBar.cpp
+++ b/source/Irrlicht/CGUIScrollBar.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIScrollBar.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -534,6 +533,3 @@ void CGUIScrollBar::refreshControls()
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h
index 170a2da0b0829c60727d9ee4f70d4f6692613396..1a6d6837eadd700b2274be52db1260db276bfe7a 100644 (file)
--- a/source/Irrlicht/CGUIScrollBar.h
+++ b/source/Irrlicht/CGUIScrollBar.h
@@ -6,8 +6,6 @@
 #define __C_GUI_SCROLL_BAR_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIScrollBar.h"\r
 #include "IGUIButton.h"\r
 \r
@@ -101,7 +99,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r

diff --git a/source/Irrlicht/CGUISkin.cpp b/source/Irrlicht/CGUISkin.cpp
index 08a5900720725d2e87dd630a611496a4a1300d60..b417b72055b55a939ba290e1507cc5d729629fff 100644 (file)
--- a/source/Irrlicht/CGUISkin.cpp
+++ b/source/Irrlicht/CGUISkin.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUISkin.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUIFont.h"\r
 #include "IGUISpriteBank.h"\r
@@ -973,6 +972,3 @@ void CGUISkin::draw2DRectangle(IGUIElement* element,
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h
index 11cfb26be0a5c044d69224229684828eac3bccb1..436124b6f1a806a98f1fe58f3ccbe254c552ca2e 100644 (file)
--- a/source/Irrlicht/CGUISkin.h
+++ b/source/Irrlicht/CGUISkin.h
@@ -6,8 +6,6 @@
 #define __C_GUI_SKIN_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUISkin.h"\r
 #include "irrString.h"\r
 \r
@@ -234,8 +232,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r
-\r

diff --git a/source/Irrlicht/CGUISpriteBank.cpp b/source/Irrlicht/CGUISpriteBank.cpp
index c89bb26eaca62632ebc61e9a853573b597773459..8f5fb67345e50bea20aa71fab8b225d3ab5916af 100644 (file)
--- a/source/Irrlicht/CGUISpriteBank.cpp
+++ b/source/Irrlicht/CGUISpriteBank.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUISpriteBank.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUIEnvironment.h"\r
 #include "IVideoDriver.h"\r
@@ -249,5 +248,3 @@ void CGUISpriteBank::draw2DSpriteBatch(     const core::array<u32>& indices,
 \r
 } // namespace gui\r
 } // namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r

diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h
index cfca788fd1abcdc9d139b8d75182a2deedf982b9..2a324a70bbefce7f7467ad3d71d25ce20461930e 100644 (file)
--- a/source/Irrlicht/CGUISpriteBank.h
+++ b/source/Irrlicht/CGUISpriteBank.h
@@ -6,8 +6,6 @@
 #define __C_GUI_SPRITE_BANK_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUISpriteBank.h"\r
 \r
 namespace irr\r
@@ -99,7 +97,4 @@ protected:
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_SPRITE_BANK_H_INCLUDED__\r
-\r

diff --git a/source/Irrlicht/CGUIStaticText.cpp b/source/Irrlicht/CGUIStaticText.cpp
index b9ab35a98642ba8337fde2fe311cd0d1631177fc..29bbdb701d8e52eb416323a6813eec58281a83c3 100644 (file)
--- a/source/Irrlicht/CGUIStaticText.cpp
+++ b/source/Irrlicht/CGUIStaticText.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUIStaticText.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUISkin.h"\r
 #include "IGUIEnvironment.h"\r
@@ -592,6 +591,3 @@ s32 CGUIStaticText::getTextWidth() const
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h
index 827e95ffdac681765ec9d62e400b461fe9dc9c34..41045d0acfc72f3c669e9d40509e24134c69f0dd 100644 (file)
--- a/source/Irrlicht/CGUIStaticText.h
+++ b/source/Irrlicht/CGUIStaticText.h
@@ -6,8 +6,6 @@
 #define __C_GUI_STATIC_TEXT_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIStaticText.h"\r
 #include "irrArray.h"\r
 \r
@@ -136,7 +134,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r

diff --git a/source/Irrlicht/CGUITabControl.cpp b/source/Irrlicht/CGUITabControl.cpp
index 30a31c39bb67f4792b6647fda411748bb154d661..c08a57993b7e8d1e395166de3195fd989ea43c04 100644 (file)
--- a/source/Irrlicht/CGUITabControl.cpp
+++ b/source/Irrlicht/CGUITabControl.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "CGUITabControl.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "CGUIButton.h"\r
 #include "IGUISkin.h"\r
@@ -1030,6 +1029,3 @@ void CGUITabControl::updateAbsolutePosition()
 \r
 } // end namespace irr\r
 } // end namespace gui\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h
index d5e8315f1687c8668d975f3b5834824d4ee45ff5..5bca2b64a1aa8bb9212e12cdf9d7dce616188b9e 100644 (file)
--- a/source/Irrlicht/CGUITabControl.h
+++ b/source/Irrlicht/CGUITabControl.h
@@ -6,8 +6,6 @@
 #define __C_GUI_TAB_CONTROL_H_INCLUDED__\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUITabControl.h"\r
 #include "irrArray.h"\r
 #include "IGUISkin.h"\r
@@ -184,7 +182,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r

diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index 877a4bf34ffff7a257fc68915e380005bd99fa26..16028c8ca58391aa25e22f7e8ec1f16cb38622c6 100644 (file)
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -88,10 +88,8 @@ CIrrDeviceStub::~CIrrDeviceStub()
 \r
 void CIrrDeviceStub::createGUIAndScene()\r
 {\r
-       #ifdef _IRR_COMPILE_WITH_GUI_\r
        // create gui environment\r
        GUIEnvironment = gui::createGUIEnvironment(FileSystem, VideoDriver, Operator);\r
-       #endif\r
 \r
        // create Scene manager\r
        SceneManager = scene::createSceneManager(VideoDriver, FileSystem, CursorControl, GUIEnvironment);\r