diff --git a/rpcs3.sln b/rpcs3.sln index 00c151cc46..6a1d8e702e 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -198,10 +198,10 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - DX12|x64.ActiveCfg = Debug - DX12|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - DX12|x64.Build.0 = Debug - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM DX12|x64.ActiveCfg = Debug - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM DX12|x64.Build.0 = Debug - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.ActiveCfg = Debug|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.Build.0 = Debug|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM DX12|x64.ActiveCfg = Debug - LLVM DX12|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM DX12|x64.Build.0 = Debug - LLVM DX12|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64 @@ -212,10 +212,10 @@ Global {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.Build.0 = Release|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - DX12|x64.ActiveCfg = Release - DX12|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - DX12|x64.Build.0 = Release - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM DX12|x64.ActiveCfg = Release - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM DX12|x64.Build.0 = Release - DX12|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.ActiveCfg = Release|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.Build.0 = Release|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM DX12|x64.ActiveCfg = Release - LLVM DX12|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM DX12|x64.Build.0 = Release - LLVM DX12|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 + {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.Build.0 = Release - LLVM|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug - DX12|x64.ActiveCfg = Debug|x64 diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index e470d93c84..a1e450b095 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -142,6 +142,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent) ppu_decoder_modes.Add("Interpreter 2"); ppu_decoder_modes.Add("Recompiler (LLVM)"); rbox_ppu_decoder = new wxRadioBox(p_core, wxID_ANY, "PPU Decoder", wxDefaultPosition, wxSize(215, -1), ppu_decoder_modes, 1); + #if !defined(LLVM_AVAILABLE) rbox_ppu_decoder->Enable(2, false); #endif @@ -164,6 +165,11 @@ SettingsDialog::SettingsDialog(wxWindow *parent) cbox_gs_d3d_adaptater->Append("renderer 1"); cbox_gs_d3d_adaptater->Append("renderer 2"); +#if !defined(DX12_SUPPORT) + cbox_gs_d3d_adaptater->Enable(false); + chbox_gs_overlay->Enable(false); +#endif + for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i) { cbox_gs_resolution->Append(wxString::Format("%dx%d", ResolutionTable[i].width.value(), ResolutionTable[i].height.value())); diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 5ba8371afc..b75eae9835 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -5,10 +5,18 @@ Debug - DX12 x64 + + Debug - LLVM + x64 + Debug - MemLeak x64 + + Debug - LLVM DX12 + x64 + Debug x64 @@ -17,6 +25,14 @@ Release - DX12 x64 + + Release - LLVM DX12 + x64 + + + Release - LLVM + x64 + Release x64 @@ -35,12 +51,24 @@ Unicode v140 + + Application + true + Unicode + v140 + Application true Unicode v140 + + Application + true + Unicode + v140 + Application true @@ -55,6 +83,14 @@ v140 false + + Application + false + true + Unicode + v140 + false + Application false @@ -63,24 +99,44 @@ v140 false + + Application + false + true + Unicode + v140 + false + + + + + + + + + + + + + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) @@ -88,12 +144,24 @@ ..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(ProjectName)-dbg + + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) + $(SolutionDir)bin\ + ..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) + $(ProjectName)-dbg + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) $(SolutionDir)bin\ ..\libs\Debug\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(ProjectName)-dbg + + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) + $(SolutionDir)bin\ + ..\libs\Debug\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) + $(ProjectName)-dbg + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(UniversalCRT_IncludePath);$(IncludePath) $(SolutionDir)bin\ @@ -108,6 +176,14 @@ false false + + false + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) + $(SolutionDir)bin\ + ..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) + false + false + false .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) @@ -116,6 +192,14 @@ false false + + false + .\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath) + $(SolutionDir)bin\ + ..\libs\Release\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) + false + false + Level3 @@ -146,6 +230,36 @@ false + + + Level3 + Disabled + ProgramDatabase + Use + ..\wxWidgets\include\msvc + Async + stdafx_gui.h + $(IntDir)$(TargetName)_gui.pch + _UNICODE;UNICODE;LLVM_AVAILABLE;%(PreprocessorDefinitions) + + + true + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies) + %(IgnoreSpecificDefaultLibraries) + true + ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64 + 0x200000000 + true + false + + + "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h + + + false + + Level3 @@ -176,6 +290,36 @@ false + + + Level3 + Disabled + ProgramDatabase + Use + ..\wxWidgets\include\msvc + Async + stdafx_gui.h + $(IntDir)$(TargetName)_gui.pch + _UNICODE;UNICODE;LLVM_AVAILABLE;DX12_SUPPORT;%(PreprocessorDefinitions) + + + true + wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies) + %(IgnoreSpecificDefaultLibraries) + true + ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64 + 0x200000000 + true + false + + + "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h + + + false + + Level3 @@ -244,6 +388,44 @@ Updating git-version.h + + + Level3 + Full + true + true + ..\wxWidgets\include\msvc + MultiThreadedDLL + WIN32;NDEBUG;_WINDOWS;LLVM_AVAILABLE;%(PreprocessorDefinitions) + false + Use + Speed + Async + false + true + stdafx_gui.h + $(IntDir)$(TargetName)_gui.pch + + + Windows + true + true + true + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies) + + + %(IgnoreSpecificDefaultLibraries) + true + ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64 + 0x200000000 + true + false + + + "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h + + Level3 @@ -283,6 +465,45 @@ Updating git-version.h + + + Level3 + Full + true + true + ..\wxWidgets\include\msvc + MultiThreadedDLL + WIN32;NDEBUG;_WINDOWS;LLVM_AVAILABLE;DX12_SUPPORT;%(PreprocessorDefinitions) + false + Use + Speed + Async + false + true + stdafx_gui.h + $(IntDir)$(TargetName)_gui.pch + false + + + Windows + true + true + true + wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies) + + + libc.lib;libcmt.lib;libcd.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + true + ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64 + 0x200000000 + true + false + + + "$(SolutionDir)\Utilities\git-version-gen.cmd" + Updating git-version.h + + @@ -315,9 +536,13 @@ Create Create + Create Create + Create Create + Create Create + Create diff --git a/rpcs3/rpcs3.vcxproj.user b/rpcs3/rpcs3.vcxproj.user index 96886c83a5..4ca6d83730 100644 --- a/rpcs3/rpcs3.vcxproj.user +++ b/rpcs3/rpcs3.vcxproj.user @@ -4,10 +4,18 @@ $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger @@ -17,18 +25,35 @@ WindowsLocalDebugger 1> stdout.log 2> stderr.log + + $(SolutionDir)bin\ + WindowsLocalDebugger + 1> stdout.log 2> stderr.log + $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger @@ -37,10 +62,18 @@ $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + $(SolutionDir)bin\ WindowsLocalDebugger + + $(SolutionDir)bin\ + WindowsLocalDebugger + false