Merge pull request #98 from MCJack123/v2.3

v2.3
MCJack123 · Mar 26, 2020 · 7256da8 · 7256da8
2 parents 973cf1d + 0fbc8ba
commit 7256da8
Show file tree

Hide file tree

Showing 67 changed files with 42,192 additions and 1,361 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 src/font.c linguist-generated
+src/peripheral/speaker_sounds.cpp linguist-generated
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,3 +25,51 @@ jobs:
         make
     - name: Run CraftOSTest
       run: make test
+
+  build-basic:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Download ROM
+      run: sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install -y libsdl2-dev libpoco-dev
+    - name: Build Lua
+      run: |
+        git submodule update --init --recursive
+        make -C craftos2-lua linux
+    - name: Build CraftOS-PC
+      run: |
+        CFLAGS=-Wall ./configure --without-ncurses --without-png --without-sdl_mixer --with-html
+        make
+    - name: Run CraftOSTest
+      run: make test
+
+  build-standalone:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install -y libsdl2-dev libsdl2-mixer-dev libhpdf-dev libpng++-dev libpoco-dev libncurses5-dev nodejs
+    - name: Build standalone ROM
+      run: |
+        git clone https://github.com/MCJack123/craftos2-rom
+        cd craftos2-rom
+        node ../packStandaloneROM.js
+        cd ..
+    - name: Build Lua
+      run: |
+        git submodule update --init --recursive
+        make -C craftos2-lua linux
+    - name: Build CraftOS-PC
+      run: |
+        CFLAGS=-Wall ./configure --with-standalone-rom=craftos2-rom/fs_standalone.cpp
+        make
+    - name: Run CraftOSTest
+      run: make test
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,7 @@ CraftOS-PC.html
 a.out*
 *.mem
 index.html
+*.obj
+*.exe
+raw_frame_reader
+src/fs_standalone.cpp
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: c++
 script: CFLAGS=-Wall ./configure && make && make test
 dist: bionic
 before_install:
-  - git submodule update --init --recursive
+  - git submodule update --init --recursive 
   - make -C craftos2-lua linux
   - sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
   - sudo apt install -y libsdl2-dev libsdl2-mixer-dev libhpdf-dev libpng++-dev libpoco-dev libncurses-dev

diff --git a/CraftOS-PC 2.rc b/CraftOS-PC 2.rc
@@ -70,8 +70,8 @@ MANIFEST                RT_MANIFEST             "CraftOS-PC.exe.manifest"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,6,0
- PRODUCTVERSION 2,2,6,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -87,12 +87,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CraftOS-PC"
-            VALUE "FileVersion", "2.2.6.0"
+            VALUE "FileVersion", "2.3.0.0"
             VALUE "InternalName", "CraftOS-PC.exe"
             VALUE "LegalCopyright", "Copyright (C) 2019-2020 JackMacWindows."
             VALUE "OriginalFilename", "CraftOS-PC.exe"
             VALUE "ProductName", "CraftOS-PC"
-            VALUE "ProductVersion", "2.2.6.0"
+            VALUE "ProductVersion", "2.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/CraftOS-PC 2.sln b/CraftOS-PC 2.sln
@@ -9,6 +9,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CraftOS-PC 2", "CraftOS-PC
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccemux", "..\ccemux\ccemux.vcxproj", "{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FD713503-EED8-49ED-BDD5-CF343782ABB1} = {FD713503-EED8-49ED-BDD5-CF343782ABB1}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "craftos2-lua", "craftos2-lua\craftos2-lua.vcxproj", "{FD713503-EED8-49ED-BDD5-CF343782ABB1}"
 EndProject
@@ -18,6 +21,8 @@ Global
 		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		ReleaseC|x64 = ReleaseC|x64
+		ReleaseC|x86 = ReleaseC|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -28,6 +33,10 @@ Global
 		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.Release|x64.Build.0 = Release|x64
 		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.Release|x86.ActiveCfg = Release|Win32
 		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.Release|x86.Build.0 = Release|Win32
+		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseC|x64.ActiveCfg = ReleaseC|x64
+		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseC|x64.Build.0 = ReleaseC|x64
+		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseC|x86.ActiveCfg = ReleaseC|Win32
+		{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseC|x86.Build.0 = ReleaseC|Win32
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Debug|x64.ActiveCfg = Debug|x64
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Debug|x64.Build.0 = Debug|x64
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Debug|x86.ActiveCfg = Debug|Win32
@@ -36,6 +45,10 @@ Global
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Release|x64.Build.0 = Release|x64
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Release|x86.ActiveCfg = Release|Win32
 		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.Release|x86.Build.0 = Release|Win32
+		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseC|x64.ActiveCfg = Release|x64
+		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseC|x64.Build.0 = Release|x64
+		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseC|x86.ActiveCfg = Release|Win32
+		{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseC|x86.Build.0 = Release|Win32
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Debug|x64.ActiveCfg = Debug|x64
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Debug|x64.Build.0 = Debug|x64
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Debug|x86.ActiveCfg = Debug|Win32
@@ -44,6 +57,10 @@ Global
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Release|x64.Build.0 = Release|x64
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Release|x86.ActiveCfg = Release|Win32
 		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.Release|x86.Build.0 = Release|Win32
+		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseC|x64.ActiveCfg = Release|x64
+		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseC|x64.Build.0 = Release|x64
+		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseC|x86.ActiveCfg = Release|Win32
+		{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseC|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/CraftOS-PC 2.vcxproj b/CraftOS-PC 2.vcxproj
@@ -5,6 +5,14 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseC|Win32">
+      <Configuration>ReleaseC</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseC|x64">
+      <Configuration>ReleaseC</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -35,6 +43,11 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -45,6 +58,11 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -56,12 +74,18 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -73,6 +97,11 @@
     <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     <Linkage-dirent>static</Linkage-dirent>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    <Linkage-dirent>static</Linkage-dirent>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     <Linkage-dirent>static</Linkage-dirent>
@@ -83,6 +112,11 @@
     <Linkage-dirent>static</Linkage-dirent>
     <TargetName>CraftOS-PC</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">
+    <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    <Linkage-dirent>static</Linkage-dirent>
+    <TargetName>CraftOS-PC</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NO_CLI;PRINT_TYPE=1;CURL_STATICLIB;WIN32;PRINT_TYPE=1;CURL_STATICLIB;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,6 +154,25 @@
       <AdditionalLibraryDirectories>$(SolutionDir)packages\curl.7.65.3\build\native\lib;$(SolutionDir)packages\sdl2.2.0.5\build\native\lib\x64\dynamic;$(SolutionDir)packages\lua51.5.1.5\build\native\lib\x64\v120\Release;$(SolutionDir)packages\jsoncpp-vc140-static-64.1.8.0\lib\native\libs\x64\static\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NO_CLI;PRINT_TYPE=1;CURL_STATICLIB;WIN32;PRINT_TYPE=1;CURL_STATICLIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir)packages\curl.7.65.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;jsoncpp.lib;libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\curl.7.65.3\build\native\lib;$(SolutionDir)packages\sdl2.2.0.5\build\native\lib\x64\dynamic;$(SolutionDir)packages\lua51.5.1.5\build\native\lib\x64\v120\Release;$(SolutionDir)packages\jsoncpp-vc140-static-64.1.8.0\lib\native\libs\x64\static\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)packages\sdl2.nuget.2.0.10\build\native\lib\x64\dynamic;$(SolutionDir)packages\vii.SDL2_mixer.2.0.2\build\native\lib\x64;$(SolutionDir)packages\poco.1.9.3\build\native\lib\x64\Debug\v142;$(SolutionDir)packages\png++.0.2.10\build\native\lib\x64\Debug;$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -158,7 +211,26 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\sdl2.nuget.2.0.10\build\native\lib\x64\dynamic;$(SolutionDir)packages\vii.SDL2_mixer.2.0.2\build\native\lib\x64;$(SolutionDir)packages\poco.1.9.3\build\native\lib\x64\Release\v142;$(SolutionDir)packages\png++.0.2.10\build\native\lib\x64\Release;$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;SDL2_mixer.lib;PocoNetmt.lib;PocoFoundationmt.lib;iphlpapi.lib;PocoNetSSLmt.lib;PocoCryptomt.lib;PocoJSONmt.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NO_CLI;_WIN64;_AMD64_;PRINT_TYPE=1;HAVE_STRERROR_S;CURL_STATICLIB</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)packages\poco.1.9.3\build\native\include;$(SolutionDir)packages\png++.0.2.10\build\native\include;$(SolutionDir)craftos2-lua\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+  </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include=".github\workflows\main.yml" />
     <None Include=".travis.yml" />
     <None Include="CraftOSTest.lua" />
     <None Include="DOCUMENTATION.md" />
@@ -197,12 +269,22 @@
     <ClInclude Include="src\peripheral\monitor.hpp" />
     <ClInclude Include="src\peripheral\peripheral.hpp" />
     <ClInclude Include="src\peripheral\printer.hpp" />
+    <ClInclude Include="src\peripheral\speaker.hpp" />
     <ClInclude Include="src\platform.hpp" />
     <ClInclude Include="src\redstone.hpp" />
     <ClInclude Include="src\term.hpp" />
-    <ClInclude Include="src\TerminalWindow.hpp" />
+    <ClInclude Include="src\terminal\CLITerminal.hpp" />
+    <ClInclude Include="src\terminal\RawTerminal.hpp" />
+    <ClInclude Include="src\terminal\SDLTerminal.hpp" />
+    <ClInclude Include="src\terminal\Terminal.hpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="examples\raw_frame_reader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\Computer.cpp" />
     <ClCompile Include="src\config.cpp" />
     <ClCompile Include="src\font.c" />
@@ -222,27 +304,44 @@
     <ClCompile Include="src\peripheral\monitor.cpp" />
     <ClCompile Include="src\peripheral\peripheral.cpp" />
     <ClCompile Include="src\peripheral\printer.cpp" />
+    <ClCompile Include="src\peripheral\speaker.cpp" />
+    <ClCompile Include="src\peripheral\speaker_sounds.cpp">
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">true</MinimalRebuild>
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</MinimalRebuild>
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</MinimalRebuild>
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</MinimalRebuild>
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</MinimalRebuild>
+      <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</MinimalRebuild>
+    </ClCompile>
     <ClCompile Include="src\platform.cpp" />
     <ClCompile Include="src\platform_darwin.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\platform_linux.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\platform_win.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="src\term.cpp" />
-    <ClCompile Include="src\TerminalWindow.cpp" />
+    <ClCompile Include="src\terminal\CLITerminal.cpp" />
+    <ClCompile Include="src\terminal\RawTerminal.cpp" />
+    <ClCompile Include="src\terminal\SDLTerminal.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CraftOS-PC 2.rc" />