Skip to content

Commit

Permalink
v2.3: Fixed standalone builds on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
MCJack123 committed Apr 26, 2020
1 parent 4ae31f7 commit 93cb457
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 1 deletion.
14 changes: 14 additions & 0 deletions CraftOS-PC 2.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Global
Release|x86 = Release|x86
ReleaseC|x64 = ReleaseC|x64
ReleaseC|x86 = ReleaseC|x86
ReleaseStandalone|x64 = ReleaseStandalone|x64
ReleaseStandalone|x86 = ReleaseStandalone|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.Debug|x64.ActiveCfg = Debug|x64
Expand All @@ -37,6 +39,10 @@ Global
{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
{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseStandalone|x64.ActiveCfg = ReleaseStandalone|x64
{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseStandalone|x64.Build.0 = ReleaseStandalone|x64
{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseStandalone|x86.ActiveCfg = ReleaseStandalone|Win32
{966C1071-8EB9-4BBA-85A4-9F9BFE05F3B1}.ReleaseStandalone|x86.Build.0 = ReleaseStandalone|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
Expand All @@ -49,6 +55,10 @@ Global
{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
{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseStandalone|x64.ActiveCfg = Release|x64
{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseStandalone|x64.Build.0 = Release|x64
{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseStandalone|x86.ActiveCfg = Standalone|Win32
{420CF327-F84D-4DA5-8A78-34C8B5CFCC7A}.ReleaseStandalone|x86.Build.0 = Standalone|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
Expand All @@ -61,6 +71,10 @@ Global
{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
{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseStandalone|x64.ActiveCfg = Release|x64
{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseStandalone|x64.Build.0 = Release|x64
{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseStandalone|x86.ActiveCfg = Standalone|Win32
{FD713503-EED8-49ED-BDD5-CF343782ABB1}.ReleaseStandalone|x86.Build.0 = Standalone|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
88 changes: 88 additions & 0 deletions CraftOS-PC 2.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseStandalone|Win32">
<Configuration>ReleaseStandalone</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseStandalone|x64">
<Configuration>ReleaseStandalone</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
Expand All @@ -43,6 +51,11 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -58,6 +71,11 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -74,6 +92,9 @@
<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)'=='ReleaseStandalone|Win32'" Label="PropertySheets">
<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>
Expand All @@ -83,6 +104,9 @@
<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)'=='ReleaseStandalone|x64'" Label="PropertySheets">
<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>
Expand All @@ -97,6 +121,11 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<Linkage-dirent>static</Linkage-dirent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|Win32'">
<LinkIncremental>true</LinkIncremental>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<Linkage-dirent>static</Linkage-dirent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|Win32'">
<LinkIncremental>true</LinkIncremental>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -112,6 +141,11 @@
<Linkage-dirent>static</Linkage-dirent>
<TargetName>CraftOS-PC</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'">
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Linkage-dirent>static</Linkage-dirent>
<TargetName>CraftOS-PC</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Linkage-dirent>static</Linkage-dirent>
Expand Down Expand Up @@ -154,6 +188,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)'=='ReleaseStandalone|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>Windows</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)'=='ReleaseC|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NO_CLI;PRINT_TYPE=1;CURL_STATICLIB;WIN32;PRINT_TYPE=1;CURL_STATICLIB;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -211,6 +264,24 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'">
<Link>
<AdditionalLibraryDirectories>$(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;PocoNetmt.lib;PocoFoundationmt.lib;iphlpapi.lib;PocoNetSSLmt.lib;PocoCryptomt.lib;PocoJSONmt.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<ClCompile>
<PreprocessorDefinitions>WIN32;NO_CLI;STANDALONE_ROM;_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>
<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>
Expand Down Expand Up @@ -255,6 +326,7 @@
<ClInclude Include="src\favicon.h" />
<ClInclude Include="src\fs.hpp" />
<ClInclude Include="src\fs_handle.hpp" />
<ClInclude Include="src\fs_standalone.hpp" />
<ClInclude Include="src\gif.hpp" />
<ClInclude Include="src\http.hpp" />
<ClInclude Include="src\http_handle.hpp" />
Expand Down Expand Up @@ -284,14 +356,22 @@
<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)'=='ReleaseStandalone|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Computer.cpp" />
<ClCompile Include="src\config.cpp" />
<ClCompile Include="src\font.c" />
<ClCompile Include="src\fs.cpp" />
<ClCompile Include="src\fs_handle.cpp" />
<ClCompile Include="src\fs_standalone.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\http.cpp" />
<ClCompile Include="src\http_handle.cpp" />
<ClCompile Include="src\lib.cpp" />
Expand All @@ -313,31 +393,39 @@
<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)'=='ReleaseStandalone|Win32'">false</MinimalRebuild>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</MinimalRebuild>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|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)'=='ReleaseStandalone|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)'=='ReleaseStandalone|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)'=='ReleaseStandalone|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)'=='ReleaseStandalone|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)'=='ReleaseStandalone|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)'=='ReleaseStandalone|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\term.cpp" />
Expand Down
6 changes: 6 additions & 0 deletions CraftOS-PC 2.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
<ClInclude Include="src\terminal\TRoRTerminal.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\fs_standalone.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\peripheral\monitor.cpp">
Expand Down Expand Up @@ -238,6 +241,9 @@
<ClCompile Include="src\terminal\TRoRTerminal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fs_standalone.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="CraftOS-PC 2.rc">
Expand Down
2 changes: 2 additions & 0 deletions src/fs_standalone.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <map>
#include <sstream>
#include <string>
#include <algorithm>

struct FileEntry {
bool isDir;
Expand All @@ -30,6 +31,7 @@ struct FileEntry {
FileEntry& operator=(const FileEntry& rhs) {isDir = rhs.isDir; if (isDir) dir = rhs.dir; else data = rhs.data; return *this;}
FileEntry& operator[](std::string key) {if (!isDir) throw std::runtime_error("Attempted to index a file"); return this->dir.at(key);}
FileEntry& path(std::string path) { // throws
std::replace(path.begin(), path.end(), '\\', '/');
std::stringstream ss(path);
std::string item;
FileEntry * retval = this;
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ int main(int argc, char*argv[]) {
#ifndef NO_MIXER
speakerInit();
#endif
#ifndef __EMSCRIPTEN__
#if !defined(__EMSCRIPTEN__) && !defined(STANDALONE_ROM)
if (!CRAFTOSPC_INDEV && selectedRenderer == 0 && config.checkUpdates && config.skipUpdate != CRAFTOSPC_VERSION)
std::thread(update_thread).detach();
#endif
Expand Down

0 comments on commit 93cb457

Please sign in to comment.