Remove the separate lua vcxproj. Somehow cursed on the buildbot :/

hrydgard · Nov 6, 2024 · 36328d0 · 36328d0
1 parent 8b2ca3d
commit 36328d0
Show file tree

Hide file tree

Showing 8 changed files with 251 additions and 433 deletions.
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
@@ -418,6 +418,34 @@
     <ClInclude Include="..\ext\libpng17\pnglibconf.h" />
     <ClInclude Include="..\ext\libpng17\pngpriv.h" />
     <ClInclude Include="..\ext\libpng17\pngstruct.h" />
+    <ClInclude Include="..\ext\lua\lapi.h" />
+    <ClInclude Include="..\ext\lua\lauxlib.h" />
+    <ClInclude Include="..\ext\lua\lcode.h" />
+    <ClInclude Include="..\ext\lua\lctype.h" />
+    <ClInclude Include="..\ext\lua\ldebug.h" />
+    <ClInclude Include="..\ext\lua\ldo.h" />
+    <ClInclude Include="..\ext\lua\lfunc.h" />
+    <ClInclude Include="..\ext\lua\lgc.h" />
+    <ClInclude Include="..\ext\lua\ljumptab.h" />
+    <ClInclude Include="..\ext\lua\llex.h" />
+    <ClInclude Include="..\ext\lua\llimits.h" />
+    <ClInclude Include="..\ext\lua\lmem.h" />
+    <ClInclude Include="..\ext\lua\lobject.h" />
+    <ClInclude Include="..\ext\lua\lopcodes.h" />
+    <ClInclude Include="..\ext\lua\lopnames.h" />
+    <ClInclude Include="..\ext\lua\lparser.h" />
+    <ClInclude Include="..\ext\lua\lprefix.h" />
+    <ClInclude Include="..\ext\lua\lstate.h" />
+    <ClInclude Include="..\ext\lua\lstring.h" />
+    <ClInclude Include="..\ext\lua\ltable.h" />
+    <ClInclude Include="..\ext\lua\ltests.h" />
+    <ClInclude Include="..\ext\lua\ltm.h" />
+    <ClInclude Include="..\ext\lua\lua.h" />
+    <ClInclude Include="..\ext\lua\luaconf.h" />
+    <ClInclude Include="..\ext\lua\lualib.h" />
+    <ClInclude Include="..\ext\lua\lundump.h" />
+    <ClInclude Include="..\ext\lua\lvm.h" />
+    <ClInclude Include="..\ext\lua\lzio.h" />
     <ClInclude Include="..\ext\minimp3\minimp3.h" />
     <ClInclude Include="..\ext\naett\naett.h" />
     <ClInclude Include="..\ext\vma\vk_mem_alloc.h" />
@@ -879,6 +907,39 @@
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       </ForcedIncludeFiles>
     </ClCompile>
+    <ClCompile Include="..\ext\lua\lapi.c" />
+    <ClCompile Include="..\ext\lua\lauxlib.c" />
+    <ClCompile Include="..\ext\lua\lbaselib.c" />
+    <ClCompile Include="..\ext\lua\lcode.c" />
+    <ClCompile Include="..\ext\lua\lcorolib.c" />
+    <ClCompile Include="..\ext\lua\lctype.c" />
+    <ClCompile Include="..\ext\lua\ldblib.c" />
+    <ClCompile Include="..\ext\lua\ldebug.c" />
+    <ClCompile Include="..\ext\lua\ldo.c" />
+    <ClCompile Include="..\ext\lua\ldump.c" />
+    <ClCompile Include="..\ext\lua\lfunc.c" />
+    <ClCompile Include="..\ext\lua\lgc.c" />
+    <ClCompile Include="..\ext\lua\linit.c" />
+    <ClCompile Include="..\ext\lua\liolib.c" />
+    <ClCompile Include="..\ext\lua\llex.c" />
+    <ClCompile Include="..\ext\lua\lmathlib.c" />
+    <ClCompile Include="..\ext\lua\lmem.c" />
+    <ClCompile Include="..\ext\lua\loadlib.c" />
+    <ClCompile Include="..\ext\lua\lobject.c" />
+    <ClCompile Include="..\ext\lua\lopcodes.c" />
+    <ClCompile Include="..\ext\lua\loslib.c" />
+    <ClCompile Include="..\ext\lua\lparser.c" />
+    <ClCompile Include="..\ext\lua\lstate.c" />
+    <ClCompile Include="..\ext\lua\lstring.c" />
+    <ClCompile Include="..\ext\lua\lstrlib.c" />
+    <ClCompile Include="..\ext\lua\ltable.c" />
+    <ClCompile Include="..\ext\lua\ltablib.c" />
+    <ClCompile Include="..\ext\lua\ltests.c" />
+    <ClCompile Include="..\ext\lua\ltm.c" />
+    <ClCompile Include="..\ext\lua\lundump.c" />
+    <ClCompile Include="..\ext\lua\lutf8lib.c" />
+    <ClCompile Include="..\ext\lua\lvm.c" />
+    <ClCompile Include="..\ext\lua\lzio.c" />
     <ClCompile Include="..\ext\minimp3\minimp3.cpp" />
     <ClCompile Include="..\ext\naett\naett.c" />
     <ClCompile Include="..\ext\vma\vk_mem_alloc.cpp" />
@@ -1088,6 +1149,7 @@
     <None Include="..\ext\basis_universal\basisu_transcoder_tables_dxt1_6.inc" />
     <None Include="..\ext\basis_universal\basisu_transcoder_tables_pvrtc2_45.inc" />
     <None Include="..\ext\basis_universal\basisu_transcoder_tables_pvrtc2_alpha_33.inc" />
+    <None Include="..\ext\lua\README.md" />
     <None Include="Render\Text\draw_text_cocoa.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
@@ -589,6 +589,90 @@
     <ClInclude Include="..\ext\imgui\imgui_impl_platform.h">
       <Filter>ext\imgui</Filter>
     </ClInclude>
+    <ClInclude Include="..\ext\lua\lapi.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lauxlib.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lcode.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lctype.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ldebug.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ldo.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lfunc.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lgc.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ljumptab.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\llex.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\llimits.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lmem.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lobject.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lopcodes.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lopnames.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lparser.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lprefix.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lstate.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lstring.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ltable.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ltests.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\ltm.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lua.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\luaconf.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lualib.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lundump.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lvm.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\lua\lzio.h">
+      <Filter>ext\lua</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -1102,6 +1186,105 @@
     <ClCompile Include="..\ext\imgui\imgui_impl_platform.cpp">
       <Filter>ext\imgui</Filter>
     </ClCompile>
+    <ClCompile Include="..\ext\lua\lapi.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lauxlib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lbaselib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lcode.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lcorolib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lctype.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ldblib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ldebug.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ldo.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ldump.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lfunc.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lgc.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\linit.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\liolib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\llex.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lmathlib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lmem.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\loadlib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lobject.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lopcodes.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\loslib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lparser.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lstate.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lstring.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lstrlib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ltable.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ltablib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ltests.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\ltm.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lundump.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lutf8lib.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lvm.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\lua\lzio.c">
+      <Filter>ext\lua</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -1224,6 +1407,9 @@
     <Filter Include="ext\imgui">
       <UniqueIdentifier>{87c4af9c-07fd-458e-8009-8b9f8b0e9b70}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ext\lua">
+      <UniqueIdentifier>{71e2e5df-5cfb-41e6-97da-f71584a7394e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">
@@ -1273,5 +1459,8 @@
     <None Include="Render\Text\draw_text_cocoa.mm">
       <Filter>Render\Text</Filter>
     </None>
+    <None Include="..\ext\lua\README.md">
+      <Filter>ext\lua</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
@@ -1483,9 +1483,6 @@
     <ProjectReference Include="..\ext\libchdr.vcxproj">
       <Project>{956f1f48-b612-46d8-89ee-96996dcd9383}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\ext\lua.vcxproj">
-      <Project>{f01c5d9d-282c-4357-8fe3-edb83a80b49b}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\ext\miniupnpc.vcxproj">
       <Project>{d8a71225-178b-424e-96c1-cc3be2c1b047}</Project>
     </ProjectReference>

diff --git a/Windows/PPSSPP.sln b/Windows/PPSSPP.sln
@@ -95,8 +95,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rcheevos", "..\ext\rcheevos
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchdr", "..\ext\libchdr.vcxproj", "{956F1F48-B612-46D8-89EE-96996DCD9383}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\ext\lua.vcxproj", "{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -415,22 +413,6 @@ Global
 		{956F1F48-B612-46D8-89EE-96996DCD9383}.Release|Win32.Build.0 = Release|Win32
 		{956F1F48-B612-46D8-89EE-96996DCD9383}.Release|x64.ActiveCfg = Release|x64
 		{956F1F48-B612-46D8-89EE-96996DCD9383}.Release|x64.Build.0 = Release|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|ARM.ActiveCfg = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|ARM.Build.0 = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|ARM64.ActiveCfg = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|ARM64.Build.0 = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|Win32.Build.0 = Debug|Win32
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|x64.ActiveCfg = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Debug|x64.Build.0 = Debug|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|ARM.ActiveCfg = Release|ARM
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|ARM.Build.0 = Release|ARM
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|ARM64.Build.0 = Release|ARM64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|Win32.ActiveCfg = Release|Win32
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|Win32.Build.0 = Release|Win32
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|x64.ActiveCfg = Release|x64
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -449,7 +431,6 @@ Global
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3} = {39FCACF8-10D9-4D8D-97AA-7507436AD932}
 		{31694510-A8C0-40F6-B09B-E8DF825ADEFA} = {39FCACF8-10D9-4D8D-97AA-7507436AD932}
 		{956F1F48-B612-46D8-89EE-96996DCD9383} = {39FCACF8-10D9-4D8D-97AA-7507436AD932}
-		{F01C5D9D-282C-4357-8FE3-EDB83A80B49B} = {39FCACF8-10D9-4D8D-97AA-7507436AD932}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2FD47774-A031-48F4-B645-A49A3140A29B}