From 14cf17f700d6a1359eef946c6d88ab3a9a85a864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 14 Dec 2017 22:14:07 -0800 Subject: [PATCH] Fixed UWP build. --- include/bx/inline/cpu.inl | 4 ++++ scripts/toolchain.lua | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/bx/inline/cpu.inl b/include/bx/inline/cpu.inl index f4d8aa7..a427df0 100644 --- a/include/bx/inline/cpu.inl +++ b/include/bx/inline/cpu.inl @@ -8,6 +8,10 @@ #endif // BX_CPU_H_HEADER_GUARD #if BX_COMPILER_MSVC +# if BX_PLATFORM_WINRT +# include +# endif // BX_PLATFORM_WINRT + # include // _mm_fence extern "C" void _ReadBarrier(); diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 779c648..11a0f5f 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -611,6 +611,9 @@ function toolchain(_buildDir, _libDir) "StaticRuntime", "NoExceptions", } + linkoptions { + "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata + } configuration { "*-gcc* or osx" } buildoptions {