Include irrlichttypes.h first to work around Irrlicht#433 (#10872)

Fixes the PcgRandom::PcgRandom linker issue, caused by inconsistent data type definition.
This commit is contained in:
Vitaliy 2021-01-28 23:25:13 +03:00 committed by GitHub
parent 82deed2d7d
commit ed0882fd58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 2 deletions

@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <map> #include <map>
#include <vector> #include <vector>
#include "util/basic_macros.h" #include "util/basic_macros.h"
#include "irrlichttypes.h"
#include <IGUIFont.h> #include <IGUIFont.h>
#include <IGUISkin.h> #include <IGUISkin.h>
#include <IGUIEnvironment.h> #include <IGUIEnvironment.h>

@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#include "irrlichttypes.h"
#include <IGUIEnvironment.h> #include <IGUIEnvironment.h>
#include "gui/guiFormSpecMenu.h" #include "gui/guiFormSpecMenu.h"
#include "util/enriched_string.h" #include "util/enriched_string.h"

@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#include <IMaterialRendererServices.h>
#include "irrlichttypes_bloated.h" #include "irrlichttypes_bloated.h"
#include <IMaterialRendererServices.h>
#include <string> #include <string>
#include "tile.h" #include "tile.h"
#include "nodedef.h" #include "nodedef.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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "irrlichttypes_extrabloated.h"
#include <ISceneNode.h> #include <ISceneNode.h>
#include <array> #include <array>
#include "camera.h" #include "camera.h"
#include "irrlichttypes_extrabloated.h"
#include "irr_ptr.h" #include "irr_ptr.h"
#include "shader.h" #include "shader.h"
#include "skyparams.h" #include "skyparams.h"

@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#include "irrlichttypes.h"
#include "IGUIEditBox.h" #include "IGUIEditBox.h"
#include "IOSOperator.h" #include "IOSOperator.h"
#include "guiScrollBar.h" #include "guiScrollBar.h"

@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#include "irrlichttypes.h"
#include <IEventReceiver.h> #include <IEventReceiver.h>
#include <IGUIButton.h> #include <IGUIButton.h>
#include <IGUIEnvironment.h> #include <IGUIEnvironment.h>