Initial webui code (that does nothing useful)
I plan to port over the existing nulldc debugger stuff to a webui so we can do remote debugging on android and more
This commit is contained in:
parent
778efcdf19
commit
5e35e7f746
|
@ -509,12 +509,9 @@
|
||||||
<Filter Include="deps\libwebsocket">
|
<Filter Include="deps\libwebsocket">
|
||||||
<UniqueIdentifier>{3d3de3ff-9e79-4920-a95a-61d190e73004}</UniqueIdentifier>
|
<UniqueIdentifier>{3d3de3ff-9e79-4920-a95a-61d190e73004}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
<<<<<<< HEAD
|
|
||||||
<Filter Include="webui">
|
<Filter Include="webui">
|
||||||
<UniqueIdentifier>{81193efc-656a-4154-9adf-146856d4c7d3}</UniqueIdentifier>
|
<UniqueIdentifier>{81193efc-656a-4154-9adf-146856d4c7d3}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
=======
|
|
||||||
>>>>>>> add libwebsocket
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\core\hw\aica\aica.h">
|
<ClInclude Include="..\core\hw\aica\aica.h">
|
||||||
|
@ -859,12 +856,9 @@
|
||||||
<ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h">
|
<ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h">
|
||||||
<Filter>deps\libwebsocket</Filter>
|
<Filter>deps\libwebsocket</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<<<<<<< HEAD
|
|
||||||
<ClInclude Include="..\core\webui\server.h">
|
<ClInclude Include="..\core\webui\server.h">
|
||||||
<Filter>webui</Filter>
|
<Filter>webui</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
=======
|
|
||||||
>>>>>>> add libwebsocket
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\core\deps\zlib\Makefile">
|
<None Include="..\core\deps\zlib\Makefile">
|
||||||
|
|
Loading…
Reference in New Issue