Skip to content

Commit 314ca4f

Browse files
authored
Fix Windows build (#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 <marcelstoer@users.noreply.github.com>
2 parents cd6452d + b6bfe1c commit 314ca4f

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

app/lua/lobject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ typedef union Closure {
380380
*/
381381

382382
#define CommonTable CommonHeader; \
383-
lu_byte flags; lu_byte lsizenode; struct Table *metatable;
383+
lu_byte flags; lu_byte lsizenode; struct Table *metatable
384384

385385
typedef union TKey {
386386
struct {

msvc/luac-cross/luac-cross.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
<ClCompile Include="..\..\app\lua\lobject.c" />
198198
<ClCompile Include="..\..\app\lua\lopcodes.c" />
199199
<ClCompile Include="..\..\app\lua\lparser.c" />
200-
<ClCompile Include="..\..\app\lua\lrotable.c" />
201200
<ClCompile Include="..\..\app\lua\lstate.c" />
202201
<ClCompile Include="..\..\app\lua\lstring.c" />
203202
<ClCompile Include="..\..\app\lua\lstrlib.c" />
@@ -234,7 +233,6 @@
234233
<ClInclude Include="..\..\app\lua\lobject.h" />
235234
<ClInclude Include="..\..\app\lua\lopcodes.h" />
236235
<ClInclude Include="..\..\app\lua\lparser.h" />
237-
<ClInclude Include="..\..\app\lua\lrodefs.h" />
238236
<ClInclude Include="..\..\app\lua\lrotable.h" />
239237
<ClInclude Include="..\..\app\lua\lstate.h" />
240238
<ClInclude Include="..\..\app\lua\lstring.h" />

msvc/luac-cross/luac-cross.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
<ClCompile Include="..\..\app\lua\lparser.c">
106106
<Filter>app\lua</Filter>
107107
</ClCompile>
108-
<ClCompile Include="..\..\app\lua\lrotable.c">
109-
<Filter>app\lua</Filter>
110-
</ClCompile>
111108
<ClCompile Include="..\..\app\lua\lstate.c">
112109
<Filter>app\lua</Filter>
113110
</ClCompile>
@@ -179,9 +176,6 @@
179176
<ClInclude Include="..\..\app\lua\lparser.h">
180177
<Filter>app\lua</Filter>
181178
</ClInclude>
182-
<ClInclude Include="..\..\app\lua\lrodefs.h">
183-
<Filter>app\lua</Filter>
184-
</ClInclude>
185179
<ClInclude Include="..\..\app\lua\lrotable.h">
186180
<Filter>app\lua</Filter>
187181
</ClInclude>

sdk-overrides/include/espconn.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk-overrides/include/espconn.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// poor mans link which also works on docker under windows
2+
#include "../../app/include/lwip/app/espconn.h"

0 commit comments

Comments
 (0)