From d57e6343cac34db552e5deecfd718f16cc937751 Mon Sep 17 00:00:00 2001 From: junjie020 Date: Mon, 22 Jul 2019 15:50:39 +0800 Subject: [PATCH 1/2] fix vs2019 some option not set --- scripts/toolchain.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index e92fd69..18eeb91 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -411,6 +411,7 @@ function toolchain(_buildDir, _libDir) or _ACTION == "vs2013" or _ACTION == "vs2015" or _ACTION == "vs2017" + or _ACTION == "vs2019" then local action = premake.action.current() From 2e4bc10d6c63b811f4aa2f9c8678339221bc73ca Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Tue, 6 Aug 2019 16:54:22 -0700 Subject: [PATCH 2/2] emmintrin.h compatibility guard Guarded emmintrin.h to only get included on allowed architectures. --- include/bx/inline/cpu.inl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/bx/inline/cpu.inl b/include/bx/inline/cpu.inl index f446f80..b5a83a4 100644 --- a/include/bx/inline/cpu.inl +++ b/include/bx/inline/cpu.inl @@ -12,7 +12,9 @@ # include # endif // BX_PLATFORM_WINRT -# include // _mm_fence +# if BX_CPU_X86 +# include // _mm_fence +# endif extern "C" void _ReadBarrier(); # pragma intrinsic(_ReadBarrier)