Fix Windows build (nodemcu#3084)

* fix build * poor mans link which also works on docker under windows * Delete espconn.h * resurecting it as regular file * Add missing newline Co-authored-by: Marcel Stör <[email protected]>
galjonsfigur · Apr 30, 2020 · 314ca4f · 314ca4f
2 parents cd6452d + b6bfe1c
commit 314ca4f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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>

diff --git a/sdk-overrides/include/espconn.h b/sdk-overrides/include/espconn.h
diff --git a/sdk-overrides/include/espconn.h 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"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// poor mans link which also works on docker under windows
		#include "../../app/include/lwip/app/espconn.h"