Merge branch 'master' into d3d12

premake5.lua

@@ -7,7 +7,7 @@ objdir(build_obj)
 
 -- Define an ARCH variable
 -- Only use this to enable architecture-specific functionality.
-if os.is("linux") then
+if os.istarget("linux") then
   ARCH = os.outputof("uname -p")
 else
   ARCH = "unknown"
@@ -221,9 +221,9 @@ solution("xenia")
   uuid("931ef4b0-6170-4f7a-aaf2-0fece7632747")
   startproject("xenia-app")
   architecture("x86_64")
-  if os.is("linux") then
+  if os.istarget("linux") then
     platforms({"Linux"})
-  elseif os.is("windows") then
+  elseif os.istarget("windows") then
     platforms({"Windows"})
     -- Minimum version to support ID3D12GraphicsCommandList1 (for
     -- SetSamplePositions).
@@ -266,7 +266,7 @@ solution("xenia")
   include("src/xenia/ui/vulkan")
   include("src/xenia/vfs")
 
-  if os.is("windows") then
+  if os.istarget("windows") then
     include("src/xenia/apu/xaudio2")
     include("src/xenia/gpu/d3d12")
     include("src/xenia/hid/winkey")