fix MSVC build

RPCS3 · May 2, 2021 · d8a4ef9 · d8a4ef9
1 parent 9ab5c9c
commit d8a4ef9
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 66 deletions.
diff --git a/3rdparty/asmjit/asmjit.vcxproj b/3rdparty/asmjit/asmjit.vcxproj
@@ -11,66 +11,66 @@
     </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" />
+    <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" />
+    <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>
@@ -91,13 +91,13 @@
   </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" />
+    <Import Project="..\..\rpcs3_default.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\rpcs3_debug.props" />
+    <Import Project="..\..\rpcs3_debug.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\rpcs3_release.props" />
+    <Import Project="..\..\rpcs3_release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>

diff --git 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
@@ -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
@@ -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
@@ -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>