diff --git a/.gitignore b/.gitignore
index c680e78a72..6eafd788c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,7 @@
/build
/bin
-/libs
+/lib
/ipch
/rpcs3/Debug
/rpcs3/Release
diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj
index 4b73e029f5..9290793a44 100644
--- a/asmjitsrc/asmjit.vcxproj
+++ b/asmjitsrc/asmjit.vcxproj
@@ -94,12 +94,12 @@
- $(SolutionDir)libs\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
- $(SolutionDir)libs\$(Configuration)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj
index d1c7dcd40f..bc883df5cb 100644
--- a/rpcs3/D3D12GSRender.vcxproj
+++ b/rpcs3/D3D12GSRender.vcxproj
@@ -61,6 +61,55 @@
+
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj
index d57e706603..720e48242b 100644
--- a/rpcs3/GLGSRender.vcxproj
+++ b/rpcs3/GLGSRender.vcxproj
@@ -61,6 +61,55 @@
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
{c4a10229-4712-4bd2-b63e-50d93c67a038}
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 0a1ae395e5..1d2f5f1d6d 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -58,6 +58,46 @@
+
+
+ true
+
+
+ false
+
+
+
+
+ true
+
+
+ true
+
+
+
+
+ true
+
+
+ false
+
+
+
+
+ true
+
+
+ true
+
+
+
+
+ true
+
+
+ false
+
+
@@ -645,6 +685,26 @@
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
+
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\
+
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index c2db39580c..9e3439594a 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -63,36 +63,41 @@
.\;..\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);..\minidx12\Include
$(SolutionDir)bin\
- ..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
$(ProjectName)-dbg
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
.\;..\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);..\minidx12\Include
$(SolutionDir)bin\
- ..\libs\Debug\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(SolutionDir)lib\Debug-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath);$(SolutionDir)lib\$(Configuration)-$(Platform)\
$(ProjectName)-dbg
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
.\;..\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);..\minidx12\Include
$(SolutionDir)bin\
- ..\libs\Debug\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(SolutionDir)lib\Debug-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath);$(SolutionDir)lib\$(Configuration)-$(Platform)\
$(ProjectName)-dbg
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
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);..\minidx12\Include
$(SolutionDir)bin\
- ..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
false
false
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\
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);..\minidx12\Include
$(SolutionDir)bin\
- ..\libs\Release\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
+ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(SolutionDir)lib\Release-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)
false
false
+ $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\