diff --git a/premake5.lua b/premake5.lua index 90e1c5a5b..bf96e9712 100644 --- a/premake5.lua +++ b/premake5.lua @@ -180,6 +180,10 @@ filter("platforms:Windows") "comctl32", "shcore", "shlwapi", + "d3d12", + "d3dcompiler", + "dxgi", + "dxguid", }) -- Create scratch/ path and dummy flags file if needed. @@ -219,6 +223,7 @@ solution("xenia") platforms({"Linux"}) elseif os.is("windows") then platforms({"Windows"}) + systemversion("10.0.10240.0") end configurations({"Checked", "Debug", "Release"}) @@ -256,6 +261,7 @@ solution("xenia") if os.is("windows") then include("src/xenia/apu/xaudio2") + include("src/xenia/gpu/d3d12") include("src/xenia/hid/winkey") include("src/xenia/hid/xinput") end diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 3b4b4b9c6..2abb7812d 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -70,6 +70,7 @@ project("xenia-app") filter("platforms:Windows") links({ "xenia-apu-xaudio2", + "xenia-gpu-d3d12", "xenia-hid-winkey", "xenia-hid-xinput", }) diff --git a/src/xenia/gpu/d3d12/premake5.lua b/src/xenia/gpu/d3d12/premake5.lua new file mode 100644 index 000000000..b65df208c --- /dev/null +++ b/src/xenia/gpu/d3d12/premake5.lua @@ -0,0 +1,21 @@ +project_root = "../../../.." +include(project_root.."/tools/build") + +group("src") +project("xenia-gpu-d3d12") + uuid("c057eae4-e7bb-4113-9a69-1fe07b735c49") + kind("StaticLib") + language("C++") + links({ + "xenia-base", + "xenia-gpu", + "xxhash", + }) + defines({ + }) + includedirs({ + project_root.."/third_party/gflags/src", + }) + local_platform_files() + files({ + }) diff --git a/src/xenia/hid/xinput/xinput_input_driver.cc b/src/xenia/hid/xinput/xinput_input_driver.cc index 9e3b95eaa..c8e203e9b 100644 --- a/src/xenia/hid/xinput/xinput_input_driver.cc +++ b/src/xenia/hid/xinput/xinput_input_driver.cc @@ -20,6 +20,10 @@ namespace xe { namespace hid { namespace xinput { +// TODO(Triang3l): Find why XInputEnable is deprecated on Windows 10. +#pragma warning(push) +#pragma warning(disable : 4995) + XInputInputDriver::XInputInputDriver(xe::ui::Window* window) : InputDriver(window) { XInputEnable(TRUE); @@ -27,6 +31,8 @@ XInputInputDriver::XInputInputDriver(xe::ui::Window* window) XInputInputDriver::~XInputInputDriver() { XInputEnable(FALSE); } +#pragma warning(pop) + X_STATUS XInputInputDriver::Setup() { return X_STATUS_SUCCESS; } X_RESULT XInputInputDriver::GetCapabilities(uint32_t user_index, uint32_t flags,