Drop dependency on IrrCompileConfig

The only remaining thing is IRRLICHT_SDK_VERSION via irrlicht.h

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 843c7ad3201994453cef39b14801ddffbd5f15a8..15263de9bfcd54a59238f10047a5533fbd22d84b 100644 (file)
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -553,13 +553,9 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
        m_rendering_engine->get_raw_device()->getCursorControl()->setVisible(true);
 
        // Set absolute mouse mode
-#if IRRLICHT_VERSION_MT_REVISION >= 9
        m_rendering_engine->get_raw_device()->getCursorControl()->setRelativeMode(false);
 #endif
 
-#endif
-
-
        /* show main menu */
        GUIEngine mymenu(&input->joystick, guiroot, m_rendering_engine, &g_menumgr, menudata, *kill);
 

diff --git a/src/client/game.cpp b/src/client/game.cpp
index c5dc8f6d9d8337f809b2111595c12066d6184145..edd0039e9240c259f7254b911164bf94dc6842fa 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2549,7 +2549,7 @@ void Game::checkZoomEnabled()
 
 void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 {
-#if !defined(__ANDROID__) && IRRLICHT_VERSION_MT_REVISION >= 9
+#ifndef __ANDROID__
        if (isMenuActive())
                device->getCursorControl()->setRelativeMode(false);
        else

diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 35e5585a0052c20834599c26097e1f221b4efdce..a29a6611afb3514effbaaa36f9504aa66457b95c 100644 (file)
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <algorithm>
 #include <ICameraSceneNode.h>
-#include <IrrCompileConfig.h>
 #include "util/string.h"
 #include "util/container.h"
 #include "util/thread.h"

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 659bb157e0c2e689d498ee53f791231d2704e60e..62c5e3310c3dcb214a1b2ec669a46511b8cda5fa 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -17,7 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <IrrCompileConfig.h>
 #include "settings.h"
 #include "porting.h"
 #include "filesys.h"
@@ -208,11 +207,7 @@ void set_default_settings()
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
 #if ENABLE_GLES
-#ifdef _IRR_COMPILE_WITH_OGLES1_
-       settings->setDefault("video_driver", "ogles1");
-#else
        settings->setDefault("video_driver", "ogles2");
-#endif
 #else
        settings->setDefault("video_driver", "opengl");
 #endif

diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h
index 5e379b28f05e220b778209472c545a582791cd1f..31105bcda4f43a8a9269fbf142f2490384bb5409 100644 (file)
--- a/src/gui/guiButton.h
+++ b/src/gui/guiButton.h
@@ -4,8 +4,6 @@
 \r
 #pragma once\r
 \r
-#include "IrrCompileConfig.h"\r
-\r
 #include <IGUIStaticText.h>\r
 #include "irrlicht_changes/static_text.h"\r
 #include "IGUIButton.h"\r

diff --git a/src/gui/guiChatConsole.cpp b/src/gui/guiChatConsole.cpp
index df4fd466b92f17873c2ce0646cb957d06ad1c3bb..ce58289b2cec858e891345bdf3c378cf9ea1cc1e 100644 (file)
--- a/src/gui/guiChatConsole.cpp
+++ b/src/gui/guiChatConsole.cpp
@@ -17,7 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "IrrCompileConfig.h"
 #include "guiChatConsole.h"
 #include "chat.h"
 #include "client/client.h"

diff --git a/src/gui/guiEditBox.cpp b/src/gui/guiEditBox.cpp
index e25c9ace39f9da61d13232f822ef545419e90e9d..b6ee71ce9ed58f6661eeec9de05ccdabcbc83277 100644 (file)
--- a/src/gui/guiEditBox.cpp
+++ b/src/gui/guiEditBox.cpp
@@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "guiEditBox.h"
 
-#include "IrrCompileConfig.h"
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
 #include "IGUIFont.h"

diff --git a/src/gui/guiSkin.cpp b/src/gui/guiSkin.cpp
index ca692f6cbc7d5c7216f0979236f8b15f5b5fa979..5462a2fec9ea85797960d9339beaab035c64ab54 100644 (file)
--- a/src/gui/guiSkin.cpp
+++ b/src/gui/guiSkin.cpp
@@ -5,7 +5,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
 #include "guiSkin.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
 \r
 #include "IGUIFont.h"\r
 #include "IGUISpriteBank.h"\r
@@ -1036,7 +1035,3 @@ void GUISkin::getColors(video::SColor* colors)
 \r
 } // end namespace gui\r
 } // end namespace irr\r
-\r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r

diff --git a/src/gui/guiSkin.h b/src/gui/guiSkin.h
index fa9b27bddaec2e8c2e4156e8d2867184cb53fe57..e90a61290db7c5edd4e338d0ca1851bd28163d59 100644 (file)
--- a/src/gui/guiSkin.h
+++ b/src/gui/guiSkin.h
@@ -5,9 +5,6 @@
 #ifndef __GUI_SKIN_H_INCLUDED__\r
 #define __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
 #include <string>\r
@@ -360,7 +357,4 @@ inline void setShading(video::SColor &color,f32 s) // :PATCH:
 }\r
 } // end namespace irr\r
 \r
-\r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r

diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp
index 4dc4523491152cea12a7021426907baa06046467..61f4da5e10015642c9e0b83d234721070de67869 100644 (file)
--- a/src/irrlicht_changes/static_text.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -5,7 +5,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "static_text.h"
-#ifdef _IRR_COMPILE_WITH_GUI_
 
 #include <IGUIFont.h>
 #include <IVideoDriver.h>
@@ -582,6 +581,3 @@ s32 StaticText::getTextWidth() const
 } // end namespace gui
 
 } // end namespace irr
-
-
-#endif // _IRR_COMPILE_WITH_GUI_

diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h
index 93a2d86432ccf940773c6bcb08dec3cc25a72b92..3608b271c15bfbbe4201137d555f4657751c2525 100644 (file)
--- a/src/irrlicht_changes/static_text.h
+++ b/src/irrlicht_changes/static_text.h
@@ -6,9 +6,6 @@
 
 #pragma once
 
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_GUI_
-
 #include "IGUIStaticText.h"
 #include "irrArray.h"
 
@@ -231,5 +228,3 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const wchar_t *
 {
        setStaticText(static_text, EnrichedString(text, static_text->getOverrideColor()));
 }
-
-#endif // _IRR_COMPILE_WITH_GUI_