Merge pull request #19613 from hrydgard/downgrade-lua

Downgrade the lua submodule to 5.4.7 stable, instead of a random commit
hrydgard · Nov 7, 2024 · da9bfa6 · da9bfa6
2 parents 8d97298 + bb64389
commit da9bfa6
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 17 deletions.
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
@@ -438,7 +438,6 @@
     <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" />
@@ -934,7 +933,6 @@
     <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" />

diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
@@ -649,9 +649,6 @@
     <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>
@@ -1267,9 +1264,6 @@
     <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>

diff --git a/UWP/lua/lua.vcxproj b/UWP/lua/lua.vcxproj
@@ -54,7 +54,6 @@
     <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" />
@@ -82,7 +81,6 @@
     <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" />

diff --git a/UWP/lua/lua.vcxproj.filters b/UWP/lua/lua.vcxproj.filters
@@ -28,7 +28,6 @@
     <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" />
@@ -56,7 +55,6 @@
     <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" />

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -66,7 +66,6 @@ LUA_FILES := \
 	$(SRC)/ext/lua/lstrlib.c \
 	$(SRC)/ext/lua/ltable.c \
 	$(SRC)/ext/lua/ltablib.c \
-	$(SRC)/ext/lua/ltests.c \
 	$(SRC)/ext/lua/ltm.c \
 	$(SRC)/ext/lua/lundump.c \
 	$(SRC)/ext/lua/lutf8lib.c \

diff --git a/ext/lua b/ext/lua
diff --git a/ext/lua-build/CMakeLists.txt b/ext/lua-build/CMakeLists.txt
@@ -53,8 +53,6 @@ set(ALL_SOURCE_FILES
 	${SRC_DIR}/ltable.c
 	${SRC_DIR}/ltable.h
 	${SRC_DIR}/ltablib.c
-	${SRC_DIR}/ltests.c
-	${SRC_DIR}/ltests.h
 	${SRC_DIR}/ltm.c
 	${SRC_DIR}/ltm.h
 	${SRC_DIR}/lua.h

diff --git a/libretro/Makefile.common b/libretro/Makefile.common
@@ -229,7 +229,6 @@ SOURCES_C += \
 	$(EXTDIR)/lua/lstrlib.c \
 	$(EXTDIR)/lua/ltable.c \
 	$(EXTDIR)/lua/ltablib.c \
-	$(EXTDIR)/lua/ltests.c \
 	$(EXTDIR)/lua/ltm.c \
 	$(EXTDIR)/lua/lundump.c \
 	$(EXTDIR)/lua/lutf8lib.c \