diff --git a/asmjit b/asmjit new file mode 160000 index 0000000000..b76922fde9 --- /dev/null +++ b/asmjit @@ -0,0 +1 @@ +Subproject commit b76922fde96232030be302b3bdd9673e9bcec568 diff --git a/asmjitsrc/asmjit.vcxproj b/asmjit.vcxproj similarity index 97% rename from asmjitsrc/asmjit.vcxproj rename to asmjit.vcxproj index 28da0c7bdb..0b8cc73555 100644 --- a/asmjitsrc/asmjit.vcxproj +++ b/asmjit.vcxproj @@ -96,22 +96,22 @@ - $(SolutionDir)libs\$(Configuration)\ + .\libs\$(Configuration)\ - $(SolutionDir)libs\$(Configuration)\ + .\libs\$(Configuration)\ - $(SolutionDir)libs\$(Configuration)\ + .\libs\$(Configuration)\ - $(SolutionDir)libs\$(Configuration)\ + .\libs\$(Configuration)\ diff --git a/asmjitsrc/asmjit.vcxproj.filters b/asmjit.vcxproj.filters similarity index 100% rename from asmjitsrc/asmjit.vcxproj.filters rename to asmjit.vcxproj.filters diff --git a/asmjitsrc/asmjit.vcxproj.user b/asmjit.vcxproj.user similarity index 100% rename from asmjitsrc/asmjit.vcxproj.user rename to asmjit.vcxproj.user diff --git a/rpcs3.sln b/rpcs3.sln index 6da2bb9f4d..7b0d30d2e0 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30110.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}" ProjectSection(ProjectDependencies) = postProject @@ -131,9 +131,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wxWidgets\build\msw\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wxWidgets\build\msw\wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjitsrc\asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asmjit", "asmjit", "{E2A982F2-4B1A-48B1-8D77-A17A589C58D7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -458,6 +456,5 @@ Global {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {23E1C437-A951-5943-8639-A17F3CF2E606} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF} - {AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7} EndGlobalSection EndGlobal