Skip to content

Commit ed0882f

Browse files
authoredJan 28, 2021
Include irrlichttypes.h first to work around Irrlicht#433 (#10872)
Fixes the PcgRandom::PcgRandom linker issue, caused by inconsistent data type definition.
1 parent 82deed2 commit ed0882f

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed
 

Diff for: ‎src/client/fontengine.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2222
#include <map>
2323
#include <vector>
2424
#include "util/basic_macros.h"
25+
#include "irrlichttypes.h"
2526
#include <IGUIFont.h>
2627
#include <IGUISkin.h>
2728
#include <IGUIEnvironment.h>

Diff for: ‎src/client/gameui.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020

2121
#pragma once
2222

23+
#include "irrlichttypes.h"
2324
#include <IGUIEnvironment.h>
2425
#include "gui/guiFormSpecMenu.h"
2526
#include "util/enriched_string.h"

Diff for: ‎src/client/shader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020

2121
#pragma once
2222

23-
#include <IMaterialRendererServices.h>
2423
#include "irrlichttypes_bloated.h"
24+
#include <IMaterialRendererServices.h>
2525
#include <string>
2626
#include "tile.h"
2727
#include "nodedef.h"

Diff for: ‎src/client/sky.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1717
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818
*/
1919

20+
#include "irrlichttypes_extrabloated.h"
2021
#include <ISceneNode.h>
2122
#include <array>
2223
#include "camera.h"
23-
#include "irrlichttypes_extrabloated.h"
2424
#include "irr_ptr.h"
2525
#include "shader.h"
2626
#include "skyparams.h"

Diff for: ‎src/gui/guiEditBox.h

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1919

2020
#pragma once
2121

22+
#include "irrlichttypes.h"
2223
#include "IGUIEditBox.h"
2324
#include "IOSOperator.h"
2425
#include "guiScrollBar.h"

Diff for: ‎src/gui/touchscreengui.h

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1818

1919
#pragma once
2020

21+
#include "irrlichttypes.h"
2122
#include <IEventReceiver.h>
2223
#include <IGUIButton.h>
2324
#include <IGUIEnvironment.h>

0 commit comments

Comments
 (0)
Please sign in to comment.