Merge branch 'master' of github.com:bkaradzic/bx

lilianjun · Aug 23, 2019 · 5192f02 · 5192f02
2 parents 5d9177e + 2e4bc10
commit 5192f02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/include/bx/inline/cpu.inl b/include/bx/inline/cpu.inl
@@ -12,7 +12,9 @@
 #		include <windows.h>
 #	endif // BX_PLATFORM_WINRT
 
-#	include <emmintrin.h> // _mm_fence
+#	if BX_CPU_X86
+#		include <emmintrin.h> // _mm_fence
+#	endif
 
 extern "C" void _ReadBarrier();
 #	pragma intrinsic(_ReadBarrier)

diff --git 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()