浏览代码

Merge pull request #23477 from Faless/uwp_fix_build

Fix UWP build.
Rémi Verschelde 6 年之前
父节点
当前提交
91d158afb2
共有 2 个文件被更改,包括 3 次插入0 次删除
  1. 2 0
      modules/freetype/SCsub
  2. 1 0
      platform/uwp/os_uwp.cpp

+ 2 - 0
modules/freetype/SCsub

@@ -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 - 0
platform/uwp/os_uwp.cpp

@@ -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>