From d8e09f14bd4a279ded0845196f677fabe7947079 Mon Sep 17 00:00:00 2001 From: numzero Date: Wed, 22 Feb 2023 20:01:44 +0300 Subject: [PATCH] Drop _IRR_COMPILE_WITH_GUI_ --- include/IrrCompileConfig.h | 1 - source/Irrlicht/CGUIButton.cpp | 4 ---- source/Irrlicht/CGUIButton.h | 5 ----- source/Irrlicht/CGUICheckBox.cpp | 5 ----- source/Irrlicht/CGUICheckBox.h | 4 ---- source/Irrlicht/CGUIComboBox.cpp | 5 ----- source/Irrlicht/CGUIComboBox.h | 5 ----- source/Irrlicht/CGUIEditBox.cpp | 4 ---- source/Irrlicht/CGUIEditBox.h | 4 ---- source/Irrlicht/CGUIEnvironment.cpp | 5 ----- source/Irrlicht/CGUIEnvironment.h | 6 ------ source/Irrlicht/CGUIFileOpenDialog.cpp | 3 --- source/Irrlicht/CGUIFileOpenDialog.h | 5 ----- source/Irrlicht/CGUIFont.cpp | 4 ---- source/Irrlicht/CGUIFont.h | 5 ----- source/Irrlicht/CGUIImage.cpp | 5 ----- source/Irrlicht/CGUIImage.h | 4 ---- source/Irrlicht/CGUIListBox.cpp | 4 ---- source/Irrlicht/CGUIListBox.h | 4 ---- source/Irrlicht/CGUIScrollBar.cpp | 4 ---- source/Irrlicht/CGUIScrollBar.h | 5 ----- source/Irrlicht/CGUISkin.cpp | 4 ---- source/Irrlicht/CGUISkin.h | 6 ------ source/Irrlicht/CGUISpriteBank.cpp | 3 --- source/Irrlicht/CGUISpriteBank.h | 5 ----- source/Irrlicht/CGUIStaticText.cpp | 4 ---- source/Irrlicht/CGUIStaticText.h | 5 ----- source/Irrlicht/CGUITabControl.cpp | 4 ---- source/Irrlicht/CGUITabControl.h | 5 ----- source/Irrlicht/CIrrDeviceStub.cpp | 2 -- 30 files changed, 129 deletions(-) diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index 7536a84..0259399 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -23,7 +23,6 @@ //! Maximum number of texture an SMaterial can have, up to 8 are supported by Irrlicht. #define _IRR_MATERIAL_MAX_TEXTURES_ 4 -#define _IRR_COMPILE_WITH_GUI_ #ifdef _WIN32 #define IRRCALLCONV __stdcall diff --git a/source/Irrlicht/CGUIButton.cpp b/source/Irrlicht/CGUIButton.cpp index 704fd3d..d6ab543 100644 --- 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 #include "CGUIButton.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -558,6 +557,3 @@ bool CGUIButton::isDrawingBorder() const } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h index 9bd8612..6c718b1 100644 --- a/source/Irrlicht/CGUIButton.h +++ b/source/Irrlicht/CGUIButton.h @@ -6,8 +6,6 @@ #define __C_GUI_BUTTON_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIButton.h" #include "IGUISpriteBank.h" #include "ITexture.h" @@ -244,7 +242,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_BUTTON_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUICheckBox.cpp b/source/Irrlicht/CGUICheckBox.cpp index 48ec5e8..6c5271f 100644 --- a/source/Irrlicht/CGUICheckBox.cpp +++ b/source/Irrlicht/CGUICheckBox.cpp @@ -4,8 +4,6 @@ #include "CGUICheckBox.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IVideoDriver.h" @@ -227,6 +225,3 @@ bool CGUICheckBox::isDrawBorderEnabled() const } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h index adb46b4..facbfb0 100644 --- a/source/Irrlicht/CGUICheckBox.h +++ b/source/Irrlicht/CGUICheckBox.h @@ -6,8 +6,6 @@ #define __C_GUI_CHECKBOX_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUICheckBox.h" namespace irr @@ -61,5 +59,3 @@ namespace gui } // end namespace irr #endif // __C_GUI_CHECKBOX_H_INCLUDED__ - -#endif // _IRR_COMPILE_WITH_GUI_ diff --git a/source/Irrlicht/CGUIComboBox.cpp b/source/Irrlicht/CGUIComboBox.cpp index b35b47a..ecd3a9c 100644 --- 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 #include "CGUIComboBox.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUIEnvironment.h" #include "IVideoDriver.h" @@ -488,7 +487,3 @@ void CGUIComboBox::openCloseMenu() } // end namespace gui } // end namespace irr - - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h index dbdae41..13996f0 100644 --- a/source/Irrlicht/CGUIComboBox.h +++ b/source/Irrlicht/CGUIComboBox.h @@ -6,8 +6,6 @@ #define __C_GUI_COMBO_BOX_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIComboBox.h" #include "IGUIStaticText.h" #include "irrString.h" @@ -107,7 +105,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_COMBO_BOX_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp index a3851e6..cf4b64e 100644 --- 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 #include "CGUIEditBox.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -1652,6 +1651,3 @@ bool CGUIEditBox::acceptsIME() } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h index b0b5070..0626fec 100644 --- a/source/Irrlicht/CGUIEditBox.h +++ b/source/Irrlicht/CGUIEditBox.h @@ -6,8 +6,6 @@ #define __C_GUI_EDIT_BOX_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIEditBox.h" #include "irrArray.h" #include "IOSOperator.h" @@ -201,6 +199,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ #endif // __C_GUI_EDIT_BOX_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUIEnvironment.cpp b/source/Irrlicht/CGUIEnvironment.cpp index 8ad956d..a7b2804 100644 --- a/source/Irrlicht/CGUIEnvironment.cpp +++ b/source/Irrlicht/CGUIEnvironment.cpp @@ -5,8 +5,6 @@ #include "CGUIEnvironment.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IVideoDriver.h" #include "CGUISkin.h" @@ -1110,6 +1108,3 @@ IGUIEnvironment* createGUIEnvironment(io::IFileSystem* fs, } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h index ab74586..2a6097c 100644 --- a/source/Irrlicht/CGUIEnvironment.h +++ b/source/Irrlicht/CGUIEnvironment.h @@ -6,8 +6,6 @@ #define __C_GUI_ENVIRONMENT_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIEnvironment.h" #include "IGUIElement.h" #include "irrArray.h" @@ -231,8 +229,4 @@ private: } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_ENVIRONMENT_H_INCLUDED__ - - diff --git a/source/Irrlicht/CGUIFileOpenDialog.cpp b/source/Irrlicht/CGUIFileOpenDialog.cpp index 6599bef..e68d7cd 100644 --- 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 #include "CGUIFileOpenDialog.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -411,5 +410,3 @@ void CGUIFileOpenDialog::sendCancelEvent() } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h index 55b9ffa..c51f604 100644 --- a/source/Irrlicht/CGUIFileOpenDialog.h +++ b/source/Irrlicht/CGUIFileOpenDialog.h @@ -6,8 +6,6 @@ #define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIFileOpenDialog.h" #include "IGUIButton.h" #include "IGUIListBox.h" @@ -90,7 +88,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp index 1becf67..b7b6ed7 100644 --- 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 #include "CGUIFont.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "os.h" #include "coreutil.h" @@ -594,6 +593,3 @@ IGUISpriteBank* CGUIFont::getSpriteBank() const } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h index 4cf93b8..c7b9337 100644 --- a/source/Irrlicht/CGUIFont.h +++ b/source/Irrlicht/CGUIFont.h @@ -6,8 +6,6 @@ #define __C_GUI_FONT_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIFontBitmap.h" #include "irrString.h" #include "IReadFile.h" @@ -111,7 +109,4 @@ private: } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_FONT_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUIImage.cpp b/source/Irrlicht/CGUIImage.cpp index 2d2a08c..669428b 100644 --- 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 #include "CGUIImage.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -177,7 +176,3 @@ core::rect CGUIImage::getDrawBounds() const } // end namespace gui } // end namespace irr - - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h index 581fe1b..37d0abc 100644 --- a/source/Irrlicht/CGUIImage.h +++ b/source/Irrlicht/CGUIImage.h @@ -6,8 +6,6 @@ #define __C_GUI_IMAGE_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIImage.h" namespace irr @@ -102,6 +100,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_IMAGE_H_INCLUDED__ diff --git a/source/Irrlicht/CGUIListBox.cpp b/source/Irrlicht/CGUIListBox.cpp index f6f0e77..b00c7e3 100644 --- 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 #include "CGUIListBox.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "CGUIListBox.h" #include "IGUISkin.h" @@ -841,6 +840,3 @@ IGUIScrollBar* CGUIListBox::getVerticalScrollBar() const } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h index 8e1566d..a615ed4 100644 --- a/source/Irrlicht/CGUIListBox.h +++ b/source/Irrlicht/CGUIListBox.h @@ -6,8 +6,6 @@ #define __C_GUI_LIST_BOX_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIListBox.h" #include "irrArray.h" @@ -178,6 +176,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif diff --git a/source/Irrlicht/CGUIScrollBar.cpp b/source/Irrlicht/CGUIScrollBar.cpp index 6d6d367..567251c 100644 --- 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 #include "CGUIScrollBar.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -534,6 +533,3 @@ void CGUIScrollBar::refreshControls() } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h index 170a2da..1a6d683 100644 --- a/source/Irrlicht/CGUIScrollBar.h +++ b/source/Irrlicht/CGUIScrollBar.h @@ -6,8 +6,6 @@ #define __C_GUI_SCROLL_BAR_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIScrollBar.h" #include "IGUIButton.h" @@ -101,7 +99,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif - diff --git a/source/Irrlicht/CGUISkin.cpp b/source/Irrlicht/CGUISkin.cpp index 08a5900..b417b72 100644 --- 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 #include "CGUISkin.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUIFont.h" #include "IGUISpriteBank.h" @@ -973,6 +972,3 @@ void CGUISkin::draw2DRectangle(IGUIElement* element, } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h index 11cfb26..436124b 100644 --- a/source/Irrlicht/CGUISkin.h +++ b/source/Irrlicht/CGUISkin.h @@ -6,8 +6,6 @@ #define __C_GUI_SKIN_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUISkin.h" #include "irrString.h" @@ -234,8 +232,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif - - diff --git a/source/Irrlicht/CGUISpriteBank.cpp b/source/Irrlicht/CGUISpriteBank.cpp index c89bb26..8f5fb67 100644 --- 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 #include "CGUISpriteBank.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUIEnvironment.h" #include "IVideoDriver.h" @@ -249,5 +248,3 @@ void CGUISpriteBank::draw2DSpriteBatch( const core::array& indices, } // namespace gui } // namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h index cfca788..2a324a7 100644 --- a/source/Irrlicht/CGUISpriteBank.h +++ b/source/Irrlicht/CGUISpriteBank.h @@ -6,8 +6,6 @@ #define __C_GUI_SPRITE_BANK_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUISpriteBank.h" namespace irr @@ -99,7 +97,4 @@ protected: } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif // __C_GUI_SPRITE_BANK_H_INCLUDED__ - diff --git a/source/Irrlicht/CGUIStaticText.cpp b/source/Irrlicht/CGUIStaticText.cpp index b9ab35a..29bbdb7 100644 --- 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 #include "CGUIStaticText.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "IGUISkin.h" #include "IGUIEnvironment.h" @@ -592,6 +591,3 @@ s32 CGUIStaticText::getTextWidth() const } // end namespace gui } // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h index 827e95f..41045d0 100644 --- a/source/Irrlicht/CGUIStaticText.h +++ b/source/Irrlicht/CGUIStaticText.h @@ -6,8 +6,6 @@ #define __C_GUI_STATIC_TEXT_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUIStaticText.h" #include "irrArray.h" @@ -136,7 +134,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif - diff --git a/source/Irrlicht/CGUITabControl.cpp b/source/Irrlicht/CGUITabControl.cpp index 30a31c3..c08a579 100644 --- 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 #include "CGUITabControl.h" -#ifdef _IRR_COMPILE_WITH_GUI_ #include "CGUIButton.h" #include "IGUISkin.h" @@ -1030,6 +1029,3 @@ void CGUITabControl::updateAbsolutePosition() } // end namespace irr } // end namespace gui - -#endif // _IRR_COMPILE_WITH_GUI_ - diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h index d5e8315..5bca2b6 100644 --- a/source/Irrlicht/CGUITabControl.h +++ b/source/Irrlicht/CGUITabControl.h @@ -6,8 +6,6 @@ #define __C_GUI_TAB_CONTROL_H_INCLUDED__ #include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - #include "IGUITabControl.h" #include "irrArray.h" #include "IGUISkin.h" @@ -184,7 +182,4 @@ namespace gui } // end namespace gui } // end namespace irr -#endif // _IRR_COMPILE_WITH_GUI_ - #endif - diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp index 877a4bf..16028c8 100644 --- a/source/Irrlicht/CIrrDeviceStub.cpp +++ b/source/Irrlicht/CIrrDeviceStub.cpp @@ -88,10 +88,8 @@ CIrrDeviceStub::~CIrrDeviceStub() void CIrrDeviceStub::createGUIAndScene() { - #ifdef _IRR_COMPILE_WITH_GUI_ // create gui environment GUIEnvironment = gui::createGUIEnvironment(FileSystem, VideoDriver, Operator); - #endif // create Scene manager SceneManager = scene::createSceneManager(VideoDriver, FileSystem, CursorControl, GUIEnvironment);