godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make that Whole New World great again

Browse Source 
Fix regression from 5dbf180 that broke Windows build.
This commit is contained in:
Rémi Verschelde 2017-03-05 19:12:22 +01:00
parent 5dbf1809c6
commit 6163343118
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles3/rasterizer_scene_gles3.h
View File

@ -29,6 +29,9 @@
#ifndef RASTERIZERSCENEGLES3_H #ifndef RASTERIZERSCENEGLES3_H
#define 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/cube_to_dp.glsl.h"
#include "drivers/gles3/shaders/effect_blur.glsl.h" #include "drivers/gles3/shaders/effect_blur.glsl.h"
#include "drivers/gles3/shaders/exposure.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/ssao_minify.glsl.h"
#include "drivers/gles3/shaders/subsurf_scattering.glsl.h" #include "drivers/gles3/shaders/subsurf_scattering.glsl.h"
#include "drivers/gles3/shaders/tonemap.glsl.h" #include "drivers/gles3/shaders/tonemap.glsl.h"
#include "rasterizer_storage_gles3.h"
class RasterizerSceneGLES3 : public RasterizerScene { class RasterizerSceneGLES3 : public RasterizerScene {
public: public:

3
modules/enet/networked_multiplayer_enet.h
View File

@ -29,10 +29,11 @@
#ifndef NETWORKED_MULTIPLAYER_ENET_H #ifndef NETWORKED_MULTIPLAYER_ENET_H
#define NETWORKED_MULTIPLAYER_ENET_H #define NETWORKED_MULTIPLAYER_ENET_H
#include "enet/enet.h"
#include "io/compression.h" #include "io/compression.h"
#include "io/networked_multiplayer_peer.h" #include "io/networked_multiplayer_peer.h"
#include <enet/enet.h>
class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer { class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer {
GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer) GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer)