diff options
| author | Vitaliy <numzer0@yandex.ru> | 2021-01-28 23:25:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 21:25:13 +0100 |
| commit | ed0882fd58fb0f663cc115d23a11643874facc06 (patch) | |
| tree | a7bb915154263deb3c37e272ff578ef8eda932b8 /src | |
| parent | 82deed2d7d5573f1fa463516732475563da59569 (diff) | |
| download | minetest-ed0882fd58fb0f663cc115d23a11643874facc06.tar.gz minetest-ed0882fd58fb0f663cc115d23a11643874facc06.tar.bz2 minetest-ed0882fd58fb0f663cc115d23a11643874facc06.zip | |
Include irrlichttypes.h first to work around Irrlicht#433 (#10872)
Fixes the PcgRandom::PcgRandom linker issue, caused by inconsistent data type definition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/fontengine.h | 1 | ||||
| -rw-r--r-- | src/client/gameui.h | 1 | ||||
| -rw-r--r-- | src/client/shader.h | 2 | ||||
| -rw-r--r-- | src/client/sky.h | 2 | ||||
| -rw-r--r-- | src/gui/guiEditBox.h | 1 | ||||
| -rw-r--r-- | src/gui/touchscreengui.h | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/src/client/fontengine.h b/src/client/fontengine.h index c6efa0df4..d62e9b8ef 100644 --- a/src/client/fontengine.h +++ b/src/client/fontengine.h @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <map> #include <vector> #include "util/basic_macros.h" +#include "irrlichttypes.h" #include <IGUIFont.h> #include <IGUISkin.h> #include <IGUIEnvironment.h> diff --git a/src/client/gameui.h b/src/client/gameui.h index 67c6a9921..b6c8a224d 100644 --- a/src/client/gameui.h +++ b/src/client/gameui.h @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +#include "irrlichttypes.h" #include <IGUIEnvironment.h> #include "gui/guiFormSpecMenu.h" #include "util/enriched_string.h" diff --git a/src/client/shader.h b/src/client/shader.h index d99182693..38ab76704 100644 --- a/src/client/shader.h +++ b/src/client/shader.h @@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include <IMaterialRendererServices.h> #include "irrlichttypes_bloated.h" +#include <IMaterialRendererServices.h> #include <string> #include "tile.h" #include "nodedef.h" diff --git a/src/client/sky.h b/src/client/sky.h index 10e1cd976..342a97596 100644 --- a/src/client/sky.h +++ b/src/client/sky.h @@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "irrlichttypes_extrabloated.h" #include <ISceneNode.h> #include <array> #include "camera.h" -#include "irrlichttypes_extrabloated.h" #include "irr_ptr.h" #include "shader.h" #include "skyparams.h" diff --git a/src/gui/guiEditBox.h b/src/gui/guiEditBox.h index a20eb61d7..c616d75d1 100644 --- a/src/gui/guiEditBox.h +++ b/src/gui/guiEditBox.h @@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +#include "irrlichttypes.h" #include "IGUIEditBox.h" #include "IOSOperator.h" #include "guiScrollBar.h" diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h index 761d33207..0349624fa 100644 --- a/src/gui/touchscreengui.h +++ b/src/gui/touchscreengui.h @@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +#include "irrlichttypes.h" #include <IEventReceiver.h> #include <IGUIButton.h> #include <IGUIEnvironment.h> |