Selaa lähdekoodia

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

Бранимир Караџић 6 vuotta sitten
vanhempi
sitoutus
5192f02708
2 muutettua tiedostoa jossa 4 lisäystä ja 1 poistoa
  1. 3 1
      include/bx/inline/cpu.inl
  2. 1 0
      scripts/toolchain.lua

+ 3 - 1
include/bx/inline/cpu.inl

@@ -12,7 +12,9 @@
 #		include <windows.h>
 #		include <windows.h>
 #	endif // BX_PLATFORM_WINRT
 #	endif // BX_PLATFORM_WINRT
 
 
-#	include <emmintrin.h> // _mm_fence
+#	if BX_CPU_X86
+#		include <emmintrin.h> // _mm_fence
+#	endif
 
 
 extern "C" void _ReadBarrier();
 extern "C" void _ReadBarrier();
 #	pragma intrinsic(_ReadBarrier)
 #	pragma intrinsic(_ReadBarrier)

+ 1 - 0
scripts/toolchain.lua

@@ -411,6 +411,7 @@ function toolchain(_buildDir, _libDir)
 		or _ACTION == "vs2013"
 		or _ACTION == "vs2013"
 		or _ACTION == "vs2015"
 		or _ACTION == "vs2015"
 		or _ACTION == "vs2017"
 		or _ACTION == "vs2017"
+		or _ACTION == "vs2019"
 		then
 		then
 
 
 		local action = premake.action.current()
 		local action = premake.action.current()