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

This commit is contained in:
Бранимир Караџић
2019-08-22 20:31:02 -07:00
2 changed files with 4 additions and 1 deletions

View File

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

View File

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