Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Include irrlichttypes.h first to work around Irrlicht#433 (#10872)
Fixes the PcgRandom::PcgRandom linker issue, caused by inconsistent data type definition.
  • Loading branch information
numberZero committed Jan 28, 2021
1 parent 82deed2 commit ed0882f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/client/fontengine.h
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/client/gameui.h
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/shader.h
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/sky.h
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/gui/guiEditBox.h
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/gui/touchscreengui.h
Expand Up @@ -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>
Expand Down

0 comments on commit ed0882f

Please sign in to comment.