From 976d9dd79e426e1289586bbeda5e056909bb3e09 Mon Sep 17 00:00:00 2001
From: Gregor <HHHartmann@users.noreply.github.com>
Date: Wed, 29 Apr 2020 21:48:01 +0200
Subject: [PATCH 1/5] fix build

---
 app/lua/lobject.h                          | 2 +-
 msvc/luac-cross/luac-cross.vcxproj         | 2 --
 msvc/luac-cross/luac-cross.vcxproj.filters | 6 ------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/lua/lobject.h b/app/lua/lobject.h
index e5c9a7de5a..0c1849c1d5 100644
--- a/app/lua/lobject.h
+++ b/app/lua/lobject.h
@@ -380,7 +380,7 @@ typedef union Closure {
 */
 
 #define CommonTable CommonHeader; \
-                    lu_byte flags; lu_byte lsizenode; struct Table *metatable;
+                    lu_byte flags; lu_byte lsizenode; struct Table *metatable
 
 typedef union TKey {
   struct {
diff --git a/msvc/luac-cross/luac-cross.vcxproj b/msvc/luac-cross/luac-cross.vcxproj
index 7233372728..2748138b07 100644
--- a/msvc/luac-cross/luac-cross.vcxproj
+++ b/msvc/luac-cross/luac-cross.vcxproj
@@ -197,7 +197,6 @@
     <ClCompile Include="..\..\app\lua\lobject.c" />
     <ClCompile Include="..\..\app\lua\lopcodes.c" />
     <ClCompile Include="..\..\app\lua\lparser.c" />
-    <ClCompile Include="..\..\app\lua\lrotable.c" />
     <ClCompile Include="..\..\app\lua\lstate.c" />
     <ClCompile Include="..\..\app\lua\lstring.c" />
     <ClCompile Include="..\..\app\lua\lstrlib.c" />
@@ -234,7 +233,6 @@
     <ClInclude Include="..\..\app\lua\lobject.h" />
     <ClInclude Include="..\..\app\lua\lopcodes.h" />
     <ClInclude Include="..\..\app\lua\lparser.h" />
-    <ClInclude Include="..\..\app\lua\lrodefs.h" />
     <ClInclude Include="..\..\app\lua\lrotable.h" />
     <ClInclude Include="..\..\app\lua\lstate.h" />
     <ClInclude Include="..\..\app\lua\lstring.h" />
diff --git a/msvc/luac-cross/luac-cross.vcxproj.filters b/msvc/luac-cross/luac-cross.vcxproj.filters
index 20fb18c2e1..5304a0f41e 100644
--- a/msvc/luac-cross/luac-cross.vcxproj.filters
+++ b/msvc/luac-cross/luac-cross.vcxproj.filters
@@ -105,9 +105,6 @@
     <ClCompile Include="..\..\app\lua\lparser.c">
       <Filter>app\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\app\lua\lrotable.c">
-      <Filter>app\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\app\lua\lstate.c">
       <Filter>app\lua</Filter>
     </ClCompile>
@@ -179,9 +176,6 @@
     <ClInclude Include="..\..\app\lua\lparser.h">
       <Filter>app\lua</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\app\lua\lrodefs.h">
-      <Filter>app\lua</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\app\lua\lrotable.h">
       <Filter>app\lua</Filter>
     </ClInclude>

From 752341887089adfcfe7cbe86e1f46254b06dea93 Mon Sep 17 00:00:00 2001
From: Gregor <HHHartmann@users.noreply.github.com>
Date: Thu, 30 Apr 2020 02:55:53 +0200
Subject: [PATCH 2/5] poor mans link which also works on docker under windows

---
 sdk-overrides/include/espconn.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk-overrides/include/espconn.h b/sdk-overrides/include/espconn.h
index 401b860b6c..4acb1ff653 120000
--- a/sdk-overrides/include/espconn.h
+++ b/sdk-overrides/include/espconn.h
@@ -1 +1,2 @@
-../../app/include/lwip/app/espconn.h
\ No newline at end of file
+// poor mans link which also works on docker under windows
+#include "../../app/include/lwip/app/espconn.h"
\ No newline at end of file

From 17f74fb0fb03aa37de2c417b73c17f6be3133bc9 Mon Sep 17 00:00:00 2001
From: Gregor <HHHartmann@users.noreply.github.com>
Date: Thu, 30 Apr 2020 03:36:20 +0200
Subject: [PATCH 3/5] Delete espconn.h

---
 sdk-overrides/include/espconn.h | 2 --
 1 file changed, 2 deletions(-)
 delete mode 120000 sdk-overrides/include/espconn.h

diff --git a/sdk-overrides/include/espconn.h b/sdk-overrides/include/espconn.h
deleted file mode 120000
index 4acb1ff653..0000000000
--- a/sdk-overrides/include/espconn.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// poor mans link which also works on docker under windows
-#include "../../app/include/lwip/app/espconn.h"
\ No newline at end of file

From 3d2c989730ca0bea96b62a5160092178abcda9d8 Mon Sep 17 00:00:00 2001
From: Gregor <HHHartmann@users.noreply.github.com>
Date: Thu, 30 Apr 2020 03:37:08 +0200
Subject: [PATCH 4/5] resurecting it as regular file

---
 sdk-overrides/include/espconn.h | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 sdk-overrides/include/espconn.h

diff --git a/sdk-overrides/include/espconn.h b/sdk-overrides/include/espconn.h
new file mode 100644
index 0000000000..4acb1ff653
--- /dev/null
+++ b/sdk-overrides/include/espconn.h
@@ -0,0 +1,2 @@
+// poor mans link which also works on docker under windows
+#include "../../app/include/lwip/app/espconn.h"
\ No newline at end of file

From b6bfe1c43c717585f7511b4cc100335735870e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20St=C3=B6r?= <marcelstoer@users.noreply.github.com>
Date: Thu, 30 Apr 2020 12:50:34 +0200
Subject: [PATCH 5/5] Add missing newline

---
 sdk-overrides/include/espconn.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk-overrides/include/espconn.h b/sdk-overrides/include/espconn.h
index 4acb1ff653..e6dcac61d9 100644
--- a/sdk-overrides/include/espconn.h
+++ b/sdk-overrides/include/espconn.h
@@ -1,2 +1,2 @@
 // poor mans link which also works on docker under windows
-#include "../../app/include/lwip/app/espconn.h"
\ No newline at end of file
+#include "../../app/include/lwip/app/espconn.h"