ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add libwebsocket

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2014-04-22 16:15:54 +03:00 committed by ptitSeb
parent a56538babc
commit 778efcdf19
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/deps/libwebsocket/lws-plat-win.c
View File

@ -362,4 +362,4 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
return ok ? dst : NULL;
}
#endif
#endif

6
shell/reicast.vcxproj.filters
View File

@ -509,9 +509,12 @@
<Filter Include="deps\libwebsocket">
<UniqueIdentifier>{3d3de3ff-9e79-4920-a95a-61d190e73004}</UniqueIdentifier>
</Filter>
<<<<<<< HEAD
<Filter Include="webui">
<UniqueIdentifier>{81193efc-656a-4154-9adf-146856d4c7d3}</UniqueIdentifier>
</Filter>
=======
>>>>>>> add libwebsocket
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\core\hw\aica\aica.h">
@ -856,9 +859,12 @@
<ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h">
<Filter>deps\libwebsocket</Filter>
</ClInclude>
<<<<<<< HEAD
<ClInclude Include="..\core\webui\server.h">
<Filter>webui</Filter>
</ClInclude>
=======
>>>>>>> add libwebsocket
</ItemGroup>
<ItemGroup>
<None Include="..\core\deps\zlib\Makefile">