Merge branch 'master' into tic_0.46.0

This commit is contained in:
BADIM-PC\Vadim 2017-09-28 09:56:09 +03:00
commit 2ed9710e25
11 changed files with 228 additions and 188 deletions

View File

@ -8,3 +8,17 @@ This is the official issues tracker of <https://tic.computer>. If you are experi
Documentation is available in the [wiki](https://github.com/nesbox/tic.computer/wiki). Documentation is available in the [wiki](https://github.com/nesbox/tic.computer/wiki).
Thanks! Thanks!
Building with Visual Studio 2015
=======
- install Visual Studio 2015
- install GIT
- run following commands in `cmd`
```
mkdir tic
cd tic
git clone https://github.com/nesbox/3rd-party
git clone https://github.com/nesbox/TIC-80.git
```
- open `TIC-80\build\windows\tic\tic.sln` and run build
- enjoy :)

View File

@ -19,14 +19,14 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\dgif_lib.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\dgif_lib.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\egif_lib.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\egif_lib.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gifalloc.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gifalloc.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_err.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_err.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_font.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_font.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_hash.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_hash.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\openbsd-reallocarray.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\openbsd-reallocarray.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\quantize.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\quantize.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{6EA9D998-7557-4AED-ABFC-142F9960C9B6}</ProjectGuid> <ProjectGuid>{6EA9D998-7557-4AED-ABFC-142F9960C9B6}</ProjectGuid>

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\dgif_lib.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\dgif_lib.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\egif_lib.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\egif_lib.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_err.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_err.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_font.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_font.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gif_hash.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gif_hash.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\gifalloc.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\gifalloc.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\openbsd-reallocarray.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\openbsd-reallocarray.c" />
<ClCompile Include="..\..\..\..\..\sdk\giflib-5.1.4\lib\quantize.c" /> <ClCompile Include="..\..\..\..\3rd-party\giflib-5.1.4\lib\quantize.c" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -19,43 +19,43 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lapi.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lapi.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lauxlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lauxlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lbaselib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lbaselib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lbitlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lbitlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lcode.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lcode.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lcorolib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lcorolib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lctype.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lctype.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldblib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldblib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldebug.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldebug.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldo.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldo.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldump.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldump.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lfunc.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lfunc.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lgc.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lgc.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\linit.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\linit.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\llex.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\llex.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lmathlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lmathlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lmem.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lmem.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\loadlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\loadlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lobject.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lobject.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lopcodes.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lopcodes.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\loslib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\loslib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lparser.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lparser.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpcap.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpcap.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpcode.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpcode.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpprint.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpprint.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lptree.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lptree.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpvm.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpvm.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstate.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstate.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstring.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstring.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstrlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstrlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltable.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltable.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltablib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltablib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltm.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltm.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lundump.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lundump.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lutf8lib.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lutf8lib.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lvm.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lvm.c" />
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lzio.c" /> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lzio.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{57D2471B-3138-495E-AF18-6E290D098FFC}</ProjectGuid> <ProjectGuid>{57D2471B-3138-495E-AF18-6E290D098FFC}</ProjectGuid>

View File

@ -12,115 +12,115 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lauxlib.c"> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpcap.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lbaselib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lbitlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lcorolib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lmathlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstrlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltablib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lutf8lib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lapi.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lcode.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lctype.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldblib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldebug.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldo.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ldump.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lfunc.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lgc.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\linit.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\llex.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lmem.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\loadlib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lobject.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lopcodes.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\loslib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lparser.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstate.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lstring.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltable.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\ltm.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lundump.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lvm.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lzio.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpcap.c">
<Filter>lpeg</Filter> <Filter>lpeg</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpcode.c"> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpprint.c">
<Filter>lpeg</Filter> <Filter>lpeg</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpprint.c"> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lptree.c">
<Filter>lpeg</Filter> <Filter>lpeg</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lptree.c"> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpvm.c">
<Filter>lpeg</Filter> <Filter>lpeg</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\..\sdk\lua-5.3.1\src\lpvm.c"> <ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lauxlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lbaselib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lapi.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lcode.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lctype.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldblib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldebug.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldo.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ldump.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lfunc.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lgc.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\linit.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\llex.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lmem.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\loadlib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lobject.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lopcodes.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\loslib.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lparser.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstate.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstring.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltable.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltm.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lundump.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lvm.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lzio.c">
<Filter>lua</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\ltablib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lstrlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lmathlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lcorolib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lbitlib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lutf8lib.c">
<Filter>lua\lib</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\3rd-party\lua-5.3.1\src\lpcode.c">
<Filter>lpeg</Filter> <Filter>lpeg</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

View File

@ -15,6 +15,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tic80", "..\tic80\tic80.vcx
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "..\example\example.vcxproj", "{86CAA9C1-C61A-40D8-AC77-33D94754C824}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "..\example\example.vcxproj", "{86CAA9C1-C61A-40D8-AC77-33D94754C824}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -71,6 +75,22 @@ Global
{86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x64.Build.0 = Release|x64 {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x64.Build.0 = Release|x64
{86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.ActiveCfg = Release|Win32 {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.ActiveCfg = Release|Win32
{86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.Build.0 = Release|Win32 {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.Build.0 = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.ActiveCfg = Debug|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.Build.0 = Debug|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.ActiveCfg = Release|Win32
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.Build.0 = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x86.ActiveCfg = Debug|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x86.Build.0 = Debug|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x86.ActiveCfg = Release|Win32
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -19,6 +19,12 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDLmain\SDLmain.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDL\SDL.vcxproj">
<Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
</ProjectReference>
<ProjectReference Include="..\gif\gif.vcxproj"> <ProjectReference Include="..\gif\gif.vcxproj">
<Project>{6ea9d998-7557-4aed-abfc-142f9960c9b6}</Project> <Project>{6ea9d998-7557-4aed-abfc-142f9960c9b6}</Project>
</ProjectReference> </ProjectReference>
@ -144,7 +150,7 @@
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -160,7 +166,7 @@
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -180,7 +186,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -200,7 +206,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib\windows</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>

View File

@ -19,21 +19,21 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\adler32.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\adler32.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\compress.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\compress.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\crc32.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\crc32.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\deflate.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\deflate.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzclose.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzclose.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzread.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzread.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzwrite.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzwrite.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\infback.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\infback.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inffast.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inffast.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inflate.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inflate.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inftrees.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inftrees.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\trees.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\trees.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\uncompr.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\uncompr.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\zutil.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\zutil.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{1DFBDFA2-F204-42FF-B99E-250E4B2EBA04}</ProjectGuid> <ProjectGuid>{1DFBDFA2-F204-42FF-B99E-250E4B2EBA04}</ProjectGuid>

View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\adler32.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\zutil.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\compress.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\adler32.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\crc32.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\compress.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\deflate.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\crc32.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzclose.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\deflate.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzlib.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzclose.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzread.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzlib.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\gzwrite.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzread.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\infback.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\gzwrite.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inffast.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\infback.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inflate.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inffast.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\inftrees.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inflate.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\trees.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\inftrees.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\uncompr.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\trees.c" />
<ClCompile Include="..\..\..\..\..\sdk\zlib-1.2.8\zutil.c" /> <ClCompile Include="..\..\..\..\3rd-party\zlib-1.2.8\uncompr.c" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Binary file not shown.

Binary file not shown.