Sync changes from upstream repository

Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
This commit is contained in:
Bozo The Builder
2019-11-05 18:13:55 -08:00
committed by Will Pearson
parent b844466e88
commit 799431a63b
130 changed files with 29557 additions and 9236 deletions

View File

@@ -564,6 +564,8 @@ static ON_String Internal_PlatformId(bool bVerbose)
"Apple"
#elif defined(ON_RUNTIME_ANDROID)
"Android"
#elif defined(ON_RUNTIME_LINUX)
"Linux"
#else
"Runtime"
#endif

View File

@@ -23,7 +23,6 @@
<ProjectGuid>{865E8D8D-8E03-4601-A7B5-A8C4094ECB8B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>exampletest</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">