diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-11-03 16:45:04 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-11-03 17:19:44 +0100 |
| commit | f17d83e75889ae341a4f762b47786e4ec86e274e (patch) | |
| tree | 0965c75a983ae9fd35cde9338c94816ec501c9c7 | |
| parent | f84893f70901dfca356d949ea1585a56154cb59f (diff) | |
Fix UWP build.
Add missing os_uwp.cpp include for VisualServerWrapMT.
Add global env forced include to fix freetype in UWP.
| -rw-r--r-- | modules/freetype/SCsub | 2 | ||||
| -rw-r--r-- | platform/uwp/os_uwp.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 7ca40c1b8b..3e2068b8db 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -59,6 +59,8 @@ if env['builtin_freetype']: if env['platform'] == 'uwp': # Include header for UWP to fix build issues env_freetype.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) + # Globally too, as freetype is used in scene (see bottom) + env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) sfnt = thirdparty_dir + 'src/sfnt/sfnt.c' if env['platform'] == 'javascript': diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index 2209ecb20e..1f81d476ea 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -47,6 +47,7 @@ #include "platform/windows/windows_terminal_logger.h" #include "servers/audio_server.h" #include "servers/visual/visual_server_raster.h" +#include "servers/visual/visual_server_wrap_mt.h" #include "thread_uwp.h" #include <ppltasks.h> |