From 616334311875da66e1a28a4d92efa1df245815c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 19:12:22 +0100 Subject: [PATCH] Make that Whole New World great again Fix regression from 5dbf180 that broke Windows build. --- drivers/gles3/rasterizer_scene_gles3.h | 4 +++- modules/enet/networked_multiplayer_enet.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 417a1d8500..b27bce726f 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -29,6 +29,9 @@ #ifndef RASTERIZERSCENEGLES3_H #define RASTERIZERSCENEGLES3_H +/* Must come before shaders or the Windows build fails... */ +#include "rasterizer_storage_gles3.h" + #include "drivers/gles3/shaders/cube_to_dp.glsl.h" #include "drivers/gles3/shaders/effect_blur.glsl.h" #include "drivers/gles3/shaders/exposure.glsl.h" @@ -40,7 +43,6 @@ #include "drivers/gles3/shaders/ssao_minify.glsl.h" #include "drivers/gles3/shaders/subsurf_scattering.glsl.h" #include "drivers/gles3/shaders/tonemap.glsl.h" -#include "rasterizer_storage_gles3.h" class RasterizerSceneGLES3 : public RasterizerScene { public: diff --git a/modules/enet/networked_multiplayer_enet.h b/modules/enet/networked_multiplayer_enet.h index 4e95adec10..4b632adcc5 100644 --- a/modules/enet/networked_multiplayer_enet.h +++ b/modules/enet/networked_multiplayer_enet.h @@ -29,10 +29,11 @@ #ifndef NETWORKED_MULTIPLAYER_ENET_H #define NETWORKED_MULTIPLAYER_ENET_H -#include "enet/enet.h" #include "io/compression.h" #include "io/networked_multiplayer_peer.h" +#include + class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer { GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer)