diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp index 7454d229c0..e2c9ed3085 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if defined(DX12_SUPPORT) #include "D3D12GSRender.h" #include #include @@ -621,3 +622,4 @@ void D3D12GSRender::Flip() { check(m_swapChain->Present(1, 0)); } +#endif \ No newline at end of file diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h index 12e1c253a4..428d4f3acb 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h @@ -1,6 +1,6 @@ #pragma once +#if defined(DX12_SUPPORT) -#ifdef _WIN32 #include #include "rpcs3/Ini.h" #include "Utilities/rPlatform.h" // only for rImage diff --git a/rpcs3/Emu/RSX/GSManager.cpp b/rpcs3/Emu/RSX/GSManager.cpp index 6a0588ec81..cbddef535a 100644 --- a/rpcs3/Emu/RSX/GSManager.cpp +++ b/rpcs3/Emu/RSX/GSManager.cpp @@ -37,7 +37,7 @@ void GSManager::Init() default: case 0: m_render = new NullGSRender(); break; case 1: m_render = new GLGSRender(); break; -#ifdef WIN32 +#if defined(DX12_SUPPORT) case 2: m_render = new D3D12GSRender(); break; #endif } diff --git a/rpcs3/Gui/D3DGSFrame.cpp b/rpcs3/Gui/D3DGSFrame.cpp index c2ede93df7..e8b22fcd73 100644 --- a/rpcs3/Gui/D3DGSFrame.cpp +++ b/rpcs3/Gui/D3DGSFrame.cpp @@ -1,4 +1,5 @@ #include "stdafx_gui.h" +#if defined(DX12_SUPPORT) #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "D3DGSFrame.h" @@ -98,3 +99,4 @@ HWND D3DGSFrame::getHandle() const { return canvas->GetHandle(); } +#endif \ No newline at end of file diff --git a/rpcs3/Gui/D3DGSFrame.h b/rpcs3/Gui/D3DGSFrame.h index 51c395eee1..47de197d0a 100644 --- a/rpcs3/Gui/D3DGSFrame.h +++ b/rpcs3/Gui/D3DGSFrame.h @@ -1,4 +1,6 @@ #pragma once + +#if defined(DX12_SUPPORT) #include "Emu/RSX/D3D12/D3D12GSRender.h" #include "Gui/GSFrame.h" #include "wx/window.h" @@ -29,4 +31,6 @@ struct D3DGSFrame : public GSFrame, public GSFrameBase2 private: virtual void OnSize(wxSizeEvent& event); -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index e9f0a6109c..ef725668a4 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -474,7 +474,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) cbox_gs_render->Append("Null"); cbox_gs_render->Append("OpenGL"); -#ifdef WIN32 +#if defined(DX12_SUPPORT) cbox_gs_render->Append("D3D12"); #endif diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 69757d3786..819e2aa7f4 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -138,10 +138,12 @@ bool Rpcs3App::OnInit() return new GLGSFrame(); }); +#if defined(DX12_SUPPORT) SetGetD3DGSFrameCallback([]() ->GSFrameBase2* { return new D3DGSFrame(); }); +#endif g_msg_dialog.reset(new MsgDialogFrame); g_savedata_dialog.reset(new SaveDataDialogFrame);