From df39bac4499c0921be68c9c3d5fc3c8d9bdb7fb4 Mon Sep 17 00:00:00 2001
From: polar <polar@ever3st.com>
Date: Sun, 2 May 2021 18:59:38 +0100
Subject: [PATCH] BUILD: Refactor asmjit submodule (#10230)

* relocated asmjit files

* fix cmake build

* fix MSVC build
---
 .gitmodules                                   |   2 +-
 3rdparty/CMakeLists.txt                       |   2 +
 {asmjitsrc => 3rdparty/asmjit}/CMakeLists.txt |   2 +-
 asmjit => 3rdparty/asmjit/asmjit              |   0
 3rdparty/asmjit/asmjit.vcxproj                | 113 ++++++++++++++++++
 3rdparty/asmjit/asmjit.vcxproj.filters        |  65 ++++++++++
 CMakeLists.txt                                |   1 -
 asmjitsrc/asmjit.vcxproj                      | 113 ------------------
 rpcs3.sln                                     |   2 +-
 rpcs3/emucore.vcxproj                         |   2 +-
 rpcs3/rpcs3.vcxproj                           |   4 +-
 rpcs3_default.props                           |   2 +-
 12 files changed, 187 insertions(+), 121 deletions(-)
 rename {asmjitsrc => 3rdparty/asmjit}/CMakeLists.txt (83%)
 rename asmjit => 3rdparty/asmjit/asmjit (100%)
 create mode 100644 3rdparty/asmjit/asmjit.vcxproj
 create mode 100644 3rdparty/asmjit/asmjit.vcxproj.filters
 delete mode 100644 asmjitsrc/asmjit.vcxproj

diff --git a/.gitmodules b/.gitmodules
index dae0305617..e1699890ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/RPCS3/ffmpeg-core
 	ignore = dirty
 [submodule "asmjit"]
-	path = asmjit
+	path = 3rdparty/asmjit/asmjit
 	url = https://github.com/asmjit/asmjit
 	branch = oldstable
 	ignore = dirty
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 6a0c2fd850..58729f1193 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -289,6 +289,8 @@ if(USE_VULKAN)
 	endif()
 endif()
 
+# AsmJit
+add_subdirectory(asmjit EXCLUDE_FROM_ALL)
 
 # OpenAL
 if (MSVC)
diff --git a/asmjitsrc/CMakeLists.txt b/3rdparty/asmjit/CMakeLists.txt
similarity index 83%
rename from asmjitsrc/CMakeLists.txt
rename to 3rdparty/asmjit/CMakeLists.txt
index e2429d116b..7dc4099db5 100644
--- a/asmjitsrc/CMakeLists.txt
+++ b/3rdparty/asmjit/CMakeLists.txt
@@ -3,7 +3,7 @@ set(ASMJIT_STATIC TRUE)
 set(ASMJIT_BUILD_X86 TRUE)
 set(ASMJIT_BUILD_ARM FALSE)
 set(ASMJIT_BUILD_TEST FALSE)
-set(ASMJIT_DIR "${CMAKE_SOURCE_DIR}/asmjit" CACHE PATH "Location of 'asmjit'")
+set(ASMJIT_DIR "${CMAKE_SOURCE_DIR}/3rdparty/asmjit/asmjit" CACHE PATH "Location of 'asmjit'")
 
 include("${ASMJIT_DIR}/CMakeLists.txt")
 
diff --git a/asmjit b/3rdparty/asmjit/asmjit
similarity index 100%
rename from asmjit
rename to 3rdparty/asmjit/asmjit
diff --git a/3rdparty/asmjit/asmjit.vcxproj b/3rdparty/asmjit/asmjit.vcxproj
new file mode 100644
index 0000000000..06f4e8e4e2
--- /dev/null
+++ b/3rdparty/asmjit/asmjit.vcxproj
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="asmjit\src\asmjit\base\arch.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codebuilder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codecompiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeemitter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeholder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\osutils.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\regalloc.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86instimpl.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86internal.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand_regs.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86regalloc.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="asmjit\src\asmjit\base\arch.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codebuilder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codecompiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeemitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeholder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\context_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\cpuinfo.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\func.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\logging.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\globals.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\lock.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\osutils.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\regalloc_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\runtime.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\string.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vectypes.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vmem.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\zone.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86compiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86instimpl_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86internal_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86logging_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86regalloc_p.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AC40FF01-426E-4838-A317-66354CEFAE88}</ProjectGuid>
+    <RootNamespace>asmjit</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="..\..\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="..\..\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PreprocessorDefinitions>ASMJIT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/3rdparty/asmjit/asmjit.vcxproj.filters b/3rdparty/asmjit/asmjit.vcxproj.filters
new file mode 100644
index 0000000000..0505172685
--- /dev/null
+++ b/3rdparty/asmjit/asmjit.vcxproj.filters
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="asmjit\src\asmjit\base\arch.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codebuilder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codecompiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeemitter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeholder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\osutils.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\regalloc.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86instimpl.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86internal.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand_regs.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86regalloc.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="asmjit\src\asmjit\base\arch.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codebuilder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codecompiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeemitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeholder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\context_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\cpuinfo.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\func.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\logging.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\globals.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\lock.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\osutils.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\regalloc_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\runtime.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\string.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vectypes.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vmem.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\zone.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86compiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86instimpl_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86internal_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86logging_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86regalloc_p.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95e76f7dce..f3cb7e3ecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,6 @@ if(MSVC)
 endif()
 
 add_subdirectory(Vulkan EXCLUDE_FROM_ALL)
-add_subdirectory(asmjitsrc EXCLUDE_FROM_ALL)
 add_subdirectory(3rdparty)
 
 unset(CMAKE_CXX_FLAGS)
diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj
deleted file mode 100644
index c80c1c0b82..0000000000
--- a/asmjitsrc/asmjit.vcxproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\asmjit\src\asmjit\base\arch.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\assembler.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\codebuilder.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\codecompiler.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\codeemitter.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\codeholder.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\constpool.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\cpuinfo.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\func.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\globals.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\inst.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\logging.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\osutils.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\operand.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\regalloc.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\runtime.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\string.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\vmem.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\base\zone.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86assembler.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86compiler.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86inst.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86instimpl.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86internal.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86logging.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86operand.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86operand_regs.cpp" />
-    <ClCompile Include="..\asmjit\src\asmjit\x86\x86regalloc.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\asmjit\src\asmjit\base\arch.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\assembler.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\codebuilder.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\codecompiler.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\codeemitter.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\codeholder.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\constpool.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\context_p.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\cpuinfo.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\func.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\logging.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\globals.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\inst.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\lock.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\operand.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\osutils.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\regalloc_p.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\runtime.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\string.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\vectypes.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\vmem.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\base\zone.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86assembler.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86compiler.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86inst.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86instimpl_p.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86internal_p.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86logging_p.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86operand.h" />
-    <ClInclude Include="..\asmjit\src\asmjit\x86\x86regalloc_p.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AC40FF01-426E-4838-A317-66354CEFAE88}</ProjectGuid>
-    <RootNamespace>asmjit</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>ASMJIT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/rpcs3.sln b/rpcs3.sln
index 448ad6c12b..44b3f4a7d6 100644
--- a/rpcs3.sln
+++ b/rpcs3.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "3rdparty\asmjit\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index f26dcbd681..2516d0cdb1 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -751,7 +751,7 @@
     <ProjectReference Include="..\3rdparty\libpng.vcxproj">
       <Project>{d6973076-9317-4ef2-a0b8-b7a18ac0713e}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\asmjitsrc\asmjit.vcxproj">
+    <ProjectReference Include="..\3rdparty\asmjit\asmjit.vcxproj">
       <Project>{ac40ff01-426e-4838-a317-66354cefae88}</Project>
     </ProjectReference>
     <ProjectReference Include="..\3rdparty\yaml-cpp.vcxproj">
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 9c29abf6b6..a879fe5f8c 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -62,12 +62,12 @@
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
+    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
     <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
+    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
diff --git a/rpcs3_default.props b/rpcs3_default.props
index 98b621099a..933fda5e90 100644
--- a/rpcs3_default.props
+++ b/rpcs3_default.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <IncludePath>.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi;..\3rdparty\Optional;..\3rdparty\xxhash</IncludePath>
+    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi;..\3rdparty\Optional;..\3rdparty\xxhash</IncludePath>
     <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
     <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
     <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>