asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix UWP build.

Browse source 
Add missing os_uwp.cpp include for VisualServerWrapMT.
Add global env forced include to fix freetype in UWP.
This commit is contained in:
Fabio Alessandrelli 2018-11-03 16:45:04 +01:00
parent f84893f709
commit f17d83e758
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/freetype/SCsub
View file

@ -59,6 +59,8 @@ if env['builtin_freetype']:
if env['platform'] == 'uwp': if env['platform'] == 'uwp':
# Include header for UWP to fix build issues # Include header for UWP to fix build issues
env_freetype.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) 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' sfnt = thirdparty_dir + 'src/sfnt/sfnt.c'
if env['platform'] == 'javascript': if env['platform'] == 'javascript':

1
platform/uwp/os_uwp.cpp
View file

@ -47,6 +47,7 @@
#include "platform/windows/windows_terminal_logger.h" #include "platform/windows/windows_terminal_logger.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h"
#include "thread_uwp.h" #include "thread_uwp.h"
#include <ppltasks.h> #include <ppltasks.h>