diff options
| author | Rémi Verschelde | 2017-05-01 22:48:01 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-01 22:48:01 +0200 |
| commit | 4dd291cecb1ebe8971b9e9d09c35bbe489b9954e (patch) | |
| tree | 69ac6de7fb947d7384152be786825db04bf34c14 /drivers | |
| parent | de7eba887e9fe940dac0958836fa8fb778628d2a (diff) | |
| parent | f7bd21a0227ad6f2a328e4f8d4fb42e726ff0a33 (diff) | |
| download | godot-4dd291cecb1ebe8971b9e9d09c35bbe489b9954e.tar.gz godot-4dd291cecb1ebe8971b9e9d09c35bbe489b9954e.tar.zst godot-4dd291cecb1ebe8971b9e9d09c35bbe489b9954e.zip | |
Merge pull request #8586 from vnen/uwp-3
Fix compilation for UWP
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_gles3.cpp | 2 | ||||
| -rw-r--r-- | drivers/xaudio2/audio_driver_xaudio2.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 4214ee5a6..db814ec72 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -72,7 +72,7 @@ RasterizerScene *RasterizerGLES3::get_scene() { #define _EXT_DEBUG_SEVERITY_LOW_ARB 0x9148 #define _EXT_DEBUG_OUTPUT 0x92E0 -#ifdef WINDOWS_ENABLED +#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED) #define GLAPIENTRY APIENTRY #else #define GLAPIENTRY diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 8d240de02..7c1d31b57 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -34,7 +34,6 @@ #include "core/os/thread.h" #include "servers/audio_server.h" -#include <mmreg.h> #include <mmsystem.h> #include <windows.h> #include <wrl/client.h> |