From: Loic Blot Date: Sun, 11 Mar 2018 16:52:46 +0000 (+0100) Subject: Finally fix android build X-Git-Tag: 5.0.0~526 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f7938fab9fa675c60bfa249f01b2b608196cdbc0;p=oweals%2Fminetest.git Finally fix android build --- diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp index 8c661b9f3..0b7adffc4 100644 --- a/src/gui/intlGUIEditBox.cpp +++ b/src/gui/intlGUIEditBox.cpp @@ -32,13 +32,12 @@ #include #include "intlGUIEditBox.h" -#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 +#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 || defined(__ANDROID__) #include "IGUISkin.h" #include "IGUIEnvironment.h" #include "IGUIFont.h" #include "IVideoDriver.h" -//#include "rect.h" //#include "irrlicht/os.cpp" #include "porting.h" //#include "Keycodes.h" diff --git a/src/gui/intlGUIEditBox.h b/src/gui/intlGUIEditBox.h index 7ebdaf1b7..3aa4f00b4 100644 --- a/src/gui/intlGUIEditBox.h +++ b/src/gui/intlGUIEditBox.h @@ -7,7 +7,7 @@ #include "IrrCompileConfig.h" //#ifdef _IRR_COMPILE_WITH_GUI_ -#include "IGUIEditBox.h" +#include #include "irrArray.h" #include "IOSOperator.h" #include "IGUIScrollBar.h"