Restructured

Examples/Demos/materials/MaterialScript/MatScriptC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{82AAFF92-A109-4A19-AB65-F30BC8E684E7}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>MatScriptC.cpp</MainSource>
@@ -438,6 +438,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/MaterialScript/MatScriptD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">MatScriptD</ProjectName>
     </PropertyGroup>
@@ -290,6 +290,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/MaterialsD.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{9C179E63-6380-43FE-BCFB-0520CF10EF1D}</ProjectGuid>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
@@ -212,13 +212,8 @@
                     <Source Name="MainSource">MaterialsD.dpr</Source>
                 </Source>
             </Delphi.Personality>
-            <Deployment Version="4">
-                <DeployFile LocalName="Win32\Debug\MaterialsD.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>MaterialsD.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
+            <Deployment Version="5">
+                <DeployFile LocalName="Win32\Debug\MaterialsD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -231,16 +226,6 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClasses">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidFileProvider">
                     <Platform Name="Android">
                         <RemoteDir>res\xml</RemoteDir>
@@ -343,6 +328,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/TransparAdv/TransparAdvC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{3A98457B-DA8D-477C-9536-B46C667B648F}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>TransparAdvC.cpp</MainSource>
@@ -380,6 +380,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/TransparAdv/TransparAdvD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">TransparAdvD</ProjectName>
     </PropertyGroup>

Examples/Demos/materials/cubemap/CubemapC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{4796E136-A992-45B6-85B8-35B7FB2D4BC0}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>CubemapC.cpp</MainSource>
@@ -559,6 +559,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/cubemap/CubemapD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">CubemapD</ProjectName>
     </PropertyGroup>
@@ -336,6 +336,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/customquad/CustomQuadC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{B2752B19-ED95-49CF-B2AD-3831A164DA03}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>CustomQuadC.cpp</MainSource>
@@ -546,6 +546,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/customquad/CustomQuadD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">CustomQuadD</ProjectName>
     </PropertyGroup>
@@ -333,6 +333,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/dynamictexture/DynTextureC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{3454934E-7D9D-4428-982E-471A0236053C}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>DynTextureC.cpp</MainSource>
@@ -552,6 +552,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/dynamictexture/DynTextureD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">DynTextureD</ProjectName>
     </PropertyGroup>
@@ -271,6 +271,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/dyncubemap/DynCubemapC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{9E3AA000-E306-453A-9001-98DAC0484E79}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>DynCubemapC.cpp</MainSource>
@@ -432,6 +432,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/dyncubemap/DynCubemapD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">DynCubemapD</ProjectName>
     </PropertyGroup>
@@ -274,6 +274,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/materialc.groupproj

@@ -0,0 +1,216 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{030D665E-1C50-48A9-B6CA-8D07889A6DE2}</ProjectGuid>
+    </PropertyGroup>
+    <ItemGroup>
+        <Projects Include="cubemap\CubemapC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="customquad\CustomQuadC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="dynamictexture\DynTextureC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="dyncubemap\DynCubemapC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="MaterialScript\MatScriptC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="mirror\MirrorC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="multimaterial\MultiMaterialC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="multipass\MultipassC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="multitexture\MultiTextureC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="objmaterial\ObjMaterialC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="proceduralclouds\ProcCloudsC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="texanim\TexAnimC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="texcombine\TexCombineC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="texformat\TexFormatC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="transparency\TransparencyC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="TransparAdv\TransparAdvC.cbproj">
+            <Dependencies/>
+        </Projects>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Default.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Default.Personality/>
+        </BorlandProject>
+    </ProjectExtensions>
+    <Target Name="CubemapC">
+        <MSBuild Projects="cubemap\CubemapC.cbproj"/>
+    </Target>
+    <Target Name="CubemapC:Clean">
+        <MSBuild Projects="cubemap\CubemapC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="CubemapC:Make">
+        <MSBuild Projects="cubemap\CubemapC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="CustomQuadC">
+        <MSBuild Projects="customquad\CustomQuadC.cbproj"/>
+    </Target>
+    <Target Name="CustomQuadC:Clean">
+        <MSBuild Projects="customquad\CustomQuadC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="CustomQuadC:Make">
+        <MSBuild Projects="customquad\CustomQuadC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="DynTextureC">
+        <MSBuild Projects="dynamictexture\DynTextureC.cbproj"/>
+    </Target>
+    <Target Name="DynTextureC:Clean">
+        <MSBuild Projects="dynamictexture\DynTextureC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="DynTextureC:Make">
+        <MSBuild Projects="dynamictexture\DynTextureC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="DynCubemapC">
+        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj"/>
+    </Target>
+    <Target Name="DynCubemapC:Clean">
+        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="DynCubemapC:Make">
+        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MatScriptC">
+        <MSBuild Projects="MaterialScript\MatScriptC.cbproj"/>
+    </Target>
+    <Target Name="MatScriptC:Clean">
+        <MSBuild Projects="MaterialScript\MatScriptC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MatScriptC:Make">
+        <MSBuild Projects="MaterialScript\MatScriptC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MirrorC">
+        <MSBuild Projects="mirror\MirrorC.cbproj"/>
+    </Target>
+    <Target Name="MirrorC:Clean">
+        <MSBuild Projects="mirror\MirrorC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MirrorC:Make">
+        <MSBuild Projects="mirror\MirrorC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MultiMaterialC">
+        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj"/>
+    </Target>
+    <Target Name="MultiMaterialC:Clean">
+        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MultiMaterialC:Make">
+        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MultipassC">
+        <MSBuild Projects="multipass\MultipassC.cbproj"/>
+    </Target>
+    <Target Name="MultipassC:Clean">
+        <MSBuild Projects="multipass\MultipassC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MultipassC:Make">
+        <MSBuild Projects="multipass\MultipassC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="MultiTextureC">
+        <MSBuild Projects="multitexture\MultiTextureC.cbproj"/>
+    </Target>
+    <Target Name="MultiTextureC:Clean">
+        <MSBuild Projects="multitexture\MultiTextureC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MultiTextureC:Make">
+        <MSBuild Projects="multitexture\MultiTextureC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="ObjMaterialC">
+        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj"/>
+    </Target>
+    <Target Name="ObjMaterialC:Clean">
+        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ObjMaterialC:Make">
+        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="ProcCloudsC">
+        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj"/>
+    </Target>
+    <Target Name="ProcCloudsC:Clean">
+        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ProcCloudsC:Make">
+        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="TexAnimC">
+        <MSBuild Projects="texanim\TexAnimC.cbproj"/>
+    </Target>
+    <Target Name="TexAnimC:Clean">
+        <MSBuild Projects="texanim\TexAnimC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TexAnimC:Make">
+        <MSBuild Projects="texanim\TexAnimC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="TexCombineC">
+        <MSBuild Projects="texcombine\TexCombineC.cbproj"/>
+    </Target>
+    <Target Name="TexCombineC:Clean">
+        <MSBuild Projects="texcombine\TexCombineC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TexCombineC:Make">
+        <MSBuild Projects="texcombine\TexCombineC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="TexFormatC">
+        <MSBuild Projects="texformat\TexFormatC.cbproj"/>
+    </Target>
+    <Target Name="TexFormatC:Clean">
+        <MSBuild Projects="texformat\TexFormatC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TexFormatC:Make">
+        <MSBuild Projects="texformat\TexFormatC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="TransparencyC">
+        <MSBuild Projects="transparency\TransparencyC.cbproj"/>
+    </Target>
+    <Target Name="TransparencyC:Clean">
+        <MSBuild Projects="transparency\TransparencyC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TransparencyC:Make">
+        <MSBuild Projects="transparency\TransparencyC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="TransparAdvC">
+        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj"/>
+    </Target>
+    <Target Name="TransparAdvC:Clean">
+        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TransparAdvC:Make">
+        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="Build">
+        <CallTarget Targets="CubemapC;CustomQuadC;DynTextureC;DynCubemapC;MatScriptC;MirrorC;MultiMaterialC;MultipassC;MultiTextureC;ObjMaterialC;ProcCloudsC;TexAnimC;TexCombineC;TexFormatC;TransparencyC;TransparAdvC"/>
+    </Target>
+    <Target Name="Clean">
+        <CallTarget Targets="CubemapC:Clean;CustomQuadC:Clean;DynTextureC:Clean;DynCubemapC:Clean;MatScriptC:Clean;MirrorC:Clean;MultiMaterialC:Clean;MultipassC:Clean;MultiTextureC:Clean;ObjMaterialC:Clean;ProcCloudsC:Clean;TexAnimC:Clean;TexCombineC:Clean;TexFormatC:Clean;TransparencyC:Clean;TransparAdvC:Clean"/>
+    </Target>
+    <Target Name="Make">
+        <CallTarget Targets="CubemapC:Make;CustomQuadC:Make;DynTextureC:Make;DynCubemapC:Make;MatScriptC:Make;MirrorC:Make;MultiMaterialC:Make;MultipassC:Make;MultiTextureC:Make;ObjMaterialC:Make;ProcCloudsC:Make;TexAnimC:Make;TexCombineC:Make;TexFormatC:Make;TransparencyC:Make;TransparAdvC:Make"/>
+    </Target>
+    <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+</Project>

Examples/Demos/materials/materials.groupproj

@@ -3,108 +3,54 @@
         <ProjectGuid>{030D665E-1C50-48A9-B6CA-8D07889A6DE2}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
-        <Projects Include="cubemap\CubemapC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="cubemap\CubemapD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="customquad\CustomQuadC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="customquad\CustomQuadD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="dynamictexture\DynTextureC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="dynamictexture\DynTextureD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="dyncubemap\DynCubemapC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="dyncubemap\DynCubemapD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="MaterialScript\MatScriptC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="MaterialScript\MatScriptD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="mirror\MirrorC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="mirror\MirrorD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="multimaterial\MultiMaterialC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="multimaterial\MultiMaterialD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="multipass\MultipassC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="multipass\MultipassD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="multitexture\MultiTextureC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="multitexture\MultiTextureD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="objmaterial\ObjMaterialC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="objmaterial\ObjMaterialD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="proceduralclouds\ProcCloudsC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="proceduralclouds\ProcCloudsD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="texanim\TexAnimC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="texanim\TexAnimD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="texcombine\TexCombineC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="texcombine\TexCombineD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="texformat\TexFormatC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="texformat\TexFormatD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="transparency\TransparencyC.cbproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="transparency\TransparencyD.dproj">
             <Dependencies/>
         </Projects>
         <Projects Include="TransparAdv\TransparAdvD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="TransparAdv\TransparAdvC.cbproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="fire2D_gr32\Fire_GR32D.dproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="fire2D_gr32\Fire_GR32C.cbproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -113,15 +59,6 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
-    <Target Name="CubemapC">
-        <MSBuild Projects="cubemap\CubemapC.cbproj"/>
-    </Target>
-    <Target Name="CubemapC:Clean">
-        <MSBuild Projects="cubemap\CubemapC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="CubemapC:Make">
-        <MSBuild Projects="cubemap\CubemapC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="CubemapD">
         <MSBuild Projects="cubemap\CubemapD.dproj"/>
     </Target>
@@ -131,15 +68,6 @@
     <Target Name="CubemapD:Make">
         <MSBuild Projects="cubemap\CubemapD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="CustomQuadC">
-        <MSBuild Projects="customquad\CustomQuadC.cbproj"/>
-    </Target>
-    <Target Name="CustomQuadC:Clean">
-        <MSBuild Projects="customquad\CustomQuadC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="CustomQuadC:Make">
-        <MSBuild Projects="customquad\CustomQuadC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="CustomQuadD">
         <MSBuild Projects="customquad\CustomQuadD.dproj"/>
     </Target>
@@ -149,15 +77,6 @@
     <Target Name="CustomQuadD:Make">
         <MSBuild Projects="customquad\CustomQuadD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="DynTextureC">
-        <MSBuild Projects="dynamictexture\DynTextureC.cbproj"/>
-    </Target>
-    <Target Name="DynTextureC:Clean">
-        <MSBuild Projects="dynamictexture\DynTextureC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="DynTextureC:Make">
-        <MSBuild Projects="dynamictexture\DynTextureC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="DynTextureD">
         <MSBuild Projects="dynamictexture\DynTextureD.dproj"/>
     </Target>
@@ -167,15 +86,6 @@
     <Target Name="DynTextureD:Make">
         <MSBuild Projects="dynamictexture\DynTextureD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="DynCubemapC">
-        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj"/>
-    </Target>
-    <Target Name="DynCubemapC:Clean">
-        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="DynCubemapC:Make">
-        <MSBuild Projects="dyncubemap\DynCubemapC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="DynCubemapD">
         <MSBuild Projects="dyncubemap\DynCubemapD.dproj"/>
     </Target>
@@ -185,15 +95,6 @@
     <Target Name="DynCubemapD:Make">
         <MSBuild Projects="dyncubemap\DynCubemapD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="MatScriptC">
-        <MSBuild Projects="MaterialScript\MatScriptC.cbproj"/>
-    </Target>
-    <Target Name="MatScriptC:Clean">
-        <MSBuild Projects="MaterialScript\MatScriptC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="MatScriptC:Make">
-        <MSBuild Projects="MaterialScript\MatScriptC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="MatScriptD">
         <MSBuild Projects="MaterialScript\MatScriptD.dproj"/>
     </Target>
@@ -203,15 +104,6 @@
     <Target Name="MatScriptD:Make">
         <MSBuild Projects="MaterialScript\MatScriptD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="MirrorC">
-        <MSBuild Projects="mirror\MirrorC.cbproj"/>
-    </Target>
-    <Target Name="MirrorC:Clean">
-        <MSBuild Projects="mirror\MirrorC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="MirrorC:Make">
-        <MSBuild Projects="mirror\MirrorC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="MirrorD">
         <MSBuild Projects="mirror\MirrorD.dproj"/>
     </Target>
@@ -221,15 +113,6 @@
     <Target Name="MirrorD:Make">
         <MSBuild Projects="mirror\MirrorD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="MultiMaterialC">
-        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj"/>
-    </Target>
-    <Target Name="MultiMaterialC:Clean">
-        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="MultiMaterialC:Make">
-        <MSBuild Projects="multimaterial\MultiMaterialC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="MultiMaterialD">
         <MSBuild Projects="multimaterial\MultiMaterialD.dproj"/>
     </Target>
@@ -239,15 +122,6 @@
     <Target Name="MultiMaterialD:Make">
         <MSBuild Projects="multimaterial\MultiMaterialD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="MultipassC">
-        <MSBuild Projects="multipass\MultipassC.cbproj"/>
-    </Target>
-    <Target Name="MultipassC:Clean">
-        <MSBuild Projects="multipass\MultipassC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="MultipassC:Make">
-        <MSBuild Projects="multipass\MultipassC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="MultipassD">
         <MSBuild Projects="multipass\MultipassD.dproj"/>
     </Target>
@@ -257,15 +131,6 @@
     <Target Name="MultipassD:Make">
         <MSBuild Projects="multipass\MultipassD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="MultiTextureC">
-        <MSBuild Projects="multitexture\MultiTextureC.cbproj"/>
-    </Target>
-    <Target Name="MultiTextureC:Clean">
-        <MSBuild Projects="multitexture\MultiTextureC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="MultiTextureC:Make">
-        <MSBuild Projects="multitexture\MultiTextureC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="MultiTextureD">
         <MSBuild Projects="multitexture\MultiTextureD.dproj"/>
     </Target>
@@ -275,15 +140,6 @@
     <Target Name="MultiTextureD:Make">
         <MSBuild Projects="multitexture\MultiTextureD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="ObjMaterialC">
-        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj"/>
-    </Target>
-    <Target Name="ObjMaterialC:Clean">
-        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="ObjMaterialC:Make">
-        <MSBuild Projects="objmaterial\ObjMaterialC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="ObjMaterialD">
         <MSBuild Projects="objmaterial\ObjMaterialD.dproj"/>
     </Target>
@@ -293,15 +149,6 @@
     <Target Name="ObjMaterialD:Make">
         <MSBuild Projects="objmaterial\ObjMaterialD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="ProcCloudsC">
-        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj"/>
-    </Target>
-    <Target Name="ProcCloudsC:Clean">
-        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="ProcCloudsC:Make">
-        <MSBuild Projects="proceduralclouds\ProcCloudsC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="ProcCloudsD">
         <MSBuild Projects="proceduralclouds\ProcCloudsD.dproj"/>
     </Target>
@@ -311,15 +158,6 @@
     <Target Name="ProcCloudsD:Make">
         <MSBuild Projects="proceduralclouds\ProcCloudsD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="TexAnimC">
-        <MSBuild Projects="texanim\TexAnimC.cbproj"/>
-    </Target>
-    <Target Name="TexAnimC:Clean">
-        <MSBuild Projects="texanim\TexAnimC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="TexAnimC:Make">
-        <MSBuild Projects="texanim\TexAnimC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="TexAnimD">
         <MSBuild Projects="texanim\TexAnimD.dproj"/>
     </Target>
@@ -329,15 +167,6 @@
     <Target Name="TexAnimD:Make">
         <MSBuild Projects="texanim\TexAnimD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="TexCombineC">
-        <MSBuild Projects="texcombine\TexCombineC.cbproj"/>
-    </Target>
-    <Target Name="TexCombineC:Clean">
-        <MSBuild Projects="texcombine\TexCombineC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="TexCombineC:Make">
-        <MSBuild Projects="texcombine\TexCombineC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="TexCombineD">
         <MSBuild Projects="texcombine\TexCombineD.dproj"/>
     </Target>
@@ -347,15 +176,6 @@
     <Target Name="TexCombineD:Make">
         <MSBuild Projects="texcombine\TexCombineD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="TexFormatC">
-        <MSBuild Projects="texformat\TexFormatC.cbproj"/>
-    </Target>
-    <Target Name="TexFormatC:Clean">
-        <MSBuild Projects="texformat\TexFormatC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="TexFormatC:Make">
-        <MSBuild Projects="texformat\TexFormatC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="TexFormatD">
         <MSBuild Projects="texformat\TexFormatD.dproj"/>
     </Target>
@@ -365,15 +185,6 @@
     <Target Name="TexFormatD:Make">
         <MSBuild Projects="texformat\TexFormatD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="TransparencyC">
-        <MSBuild Projects="transparency\TransparencyC.cbproj"/>
-    </Target>
-    <Target Name="TransparencyC:Clean">
-        <MSBuild Projects="transparency\TransparencyC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="TransparencyC:Make">
-        <MSBuild Projects="transparency\TransparencyC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="TransparencyD">
         <MSBuild Projects="transparency\TransparencyD.dproj"/>
     </Target>
@@ -392,41 +203,14 @@
     <Target Name="TransparAdvD:Make">
         <MSBuild Projects="TransparAdv\TransparAdvD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="TransparAdvC">
-        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj"/>
-    </Target>
-    <Target Name="TransparAdvC:Clean">
-        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="TransparAdvC:Make">
-        <MSBuild Projects="TransparAdv\TransparAdvC.cbproj" Targets="Make"/>
-    </Target>
-    <Target Name="Fire_GR32D">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj"/>
-    </Target>
-    <Target Name="Fire_GR32D:Clean">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="Fire_GR32D:Make">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="Fire_GR32C">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj"/>
-    </Target>
-    <Target Name="Fire_GR32C:Clean">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="Fire_GR32C:Make">
-        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="CubemapC;CubemapD;CustomQuadC;CustomQuadD;DynTextureC;DynTextureD;DynCubemapC;DynCubemapD;MatScriptC;MatScriptD;MirrorC;MirrorD;MultiMaterialC;MultiMaterialD;MultipassC;MultipassD;MultiTextureC;MultiTextureD;ObjMaterialC;ObjMaterialD;ProcCloudsC;ProcCloudsD;TexAnimC;TexAnimD;TexCombineC;TexCombineD;TexFormatC;TexFormatD;TransparencyC;TransparencyD;TransparAdvD;TransparAdvC;Fire_GR32D;Fire_GR32C"/>
+        <CallTarget Targets="CubemapD;CustomQuadD;DynTextureD;DynCubemapD;MatScriptD;MirrorD;MultiMaterialD;MultipassD;MultiTextureD;ObjMaterialD;ProcCloudsD;TexAnimD;TexCombineD;TexFormatD;TransparencyD;TransparAdvD"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="CubemapC:Clean;CubemapD:Clean;CustomQuadC:Clean;CustomQuadD:Clean;DynTextureC:Clean;DynTextureD:Clean;DynCubemapC:Clean;DynCubemapD:Clean;MatScriptC:Clean;MatScriptD:Clean;MirrorC:Clean;MirrorD:Clean;MultiMaterialC:Clean;MultiMaterialD:Clean;MultipassC:Clean;MultipassD:Clean;MultiTextureC:Clean;MultiTextureD:Clean;ObjMaterialC:Clean;ObjMaterialD:Clean;ProcCloudsC:Clean;ProcCloudsD:Clean;TexAnimC:Clean;TexAnimD:Clean;TexCombineC:Clean;TexCombineD:Clean;TexFormatC:Clean;TexFormatD:Clean;TransparencyC:Clean;TransparencyD:Clean;TransparAdvD:Clean;TransparAdvC:Clean;Fire_GR32D:Clean;Fire_GR32C:Clean"/>
+        <CallTarget Targets="CubemapD:Clean;CustomQuadD:Clean;DynTextureD:Clean;DynCubemapD:Clean;MatScriptD:Clean;MirrorD:Clean;MultiMaterialD:Clean;MultipassD:Clean;MultiTextureD:Clean;ObjMaterialD:Clean;ProcCloudsD:Clean;TexAnimD:Clean;TexCombineD:Clean;TexFormatD:Clean;TransparencyD:Clean;TransparAdvD:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="CubemapC:Make;CubemapD:Make;CustomQuadC:Make;CustomQuadD:Make;DynTextureC:Make;DynTextureD:Make;DynCubemapC:Make;DynCubemapD:Make;MatScriptC:Make;MatScriptD:Make;MirrorC:Make;MirrorD:Make;MultiMaterialC:Make;MultiMaterialD:Make;MultipassC:Make;MultipassD:Make;MultiTextureC:Make;MultiTextureD:Make;ObjMaterialC:Make;ObjMaterialD:Make;ProcCloudsC:Make;ProcCloudsD:Make;TexAnimC:Make;TexAnimD:Make;TexCombineC:Make;TexCombineD:Make;TexFormatC:Make;TexFormatD:Make;TransparencyC:Make;TransparencyD:Make;TransparAdvD:Make;TransparAdvC:Make;Fire_GR32D:Make;Fire_GR32C:Make"/>
+        <CallTarget Targets="CubemapD:Make;CustomQuadD:Make;DynTextureD:Make;DynCubemapD:Make;MatScriptD:Make;MirrorD:Make;MultiMaterialD:Make;MultipassD:Make;MultiTextureD:Make;ObjMaterialD:Make;ProcCloudsD:Make;TexAnimD:Make;TexCombineD:Make;TexFormatD:Make;TransparencyD:Make;TransparAdvD:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Examples/Demos/materials/mirror/MirrorC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{71840F9E-3D69-43A4-B998-BA4CAC55F97D}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>MirrorC.cpp</MainSource>
@@ -557,6 +557,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/mirror/MirrorD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">MirrorD</ProjectName>
     </PropertyGroup>
@@ -297,6 +297,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multimaterial/MultiMaterialC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{588858EC-0AB4-408A-8E01-AC014F2C8DE1}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>MultiMaterialC.cpp</MainSource>
@@ -428,6 +428,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multimaterial/MultiMaterialD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">MultiMaterialD</ProjectName>
     </PropertyGroup>
@@ -282,6 +282,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multipass/MultipassC.cbproj

@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -453,6 +453,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multipass/MultipassD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">MultipassD</ProjectName>
     </PropertyGroup>
@@ -269,6 +269,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multitexture/MultiTextureC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{E0CF0848-D4EC-4869-9919-CAEB3AB345A1}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>MultiTextureC.cpp</MainSource>
@@ -428,6 +428,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/multitexture/MultiTextureD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">MultiTextureD</ProjectName>
     </PropertyGroup>
@@ -266,6 +266,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/objmaterial/ObjMaterialC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{AB99DAD7-9650-4FA6-BBA3-ADA4DC249E37}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>ObjMaterialC.cpp</MainSource>
@@ -380,6 +380,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/objmaterial/ObjMaterialD.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{EE3A4BC6-8C20-49CF-866C-7DF15DEA3447}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
@@ -253,6 +253,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/proceduralclouds/ProcCloudsC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{E6487AD7-6441-4FF9-941A-B896E242176A}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>ProcCloudsC.cpp</MainSource>
@@ -400,6 +400,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/proceduralclouds/ProcCloudsD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ProcCloudsD</ProjectName>
     </PropertyGroup>
@@ -266,6 +266,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texanim/TexAnimC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{39766350-8D05-47AE-96FF-B37F7E427A93}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>TexAnimC.cpp</MainSource>
@@ -412,6 +412,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texanim/TexAnimD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">TexAnimD</ProjectName>
     </PropertyGroup>
@@ -269,6 +269,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texcombine/TexCombineC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{84DC38F5-5B9E-4E6D-8989-805C1E440A1B}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>TexCombineC.cpp</MainSource>
@@ -365,6 +365,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texcombine/TexCombineD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">TexCombineD</ProjectName>
     </PropertyGroup>
@@ -269,6 +269,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texformat/TexFormatC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{C992C2E3-E770-42E5-B9E5-16C6EC3FE487}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>TexFormatC.cpp</MainSource>
@@ -402,6 +402,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/texformat/TexFormatD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">TexFormatD</ProjectName>
     </PropertyGroup>
@@ -266,6 +266,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/transparency/TransparencyC.cbproj

@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -457,6 +457,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/transparency/TransparencyD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">TransparencyD</ProjectName>
     </PropertyGroup>
@@ -266,6 +266,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/ArchiveEdit/ArchiveEditD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ArchiveEditD</ProjectName>
     </PropertyGroup>
@@ -282,6 +282,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/ArchiverDemo/ArchiverD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ArchiverD</ProjectName>
     </PropertyGroup>
@@ -271,6 +271,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/GLInfos/GLInfosD.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{7A63F8EB-0C75-49B9-A3CE-4578A925FF29}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>GLInfosD.dpr</MainSource>
         <Base>True</Base>
@@ -331,6 +331,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/ScreenSaver/ScreenSaverC.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{30320713-03F1-4D97-BC96-001619C8A139}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>ScreenSaverC.cpp</MainSource>
@@ -437,6 +437,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/ScreenSaver/ScreenSaverD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ScreenSaverD</ProjectName>
     </PropertyGroup>
@@ -278,6 +278,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/fontgen/FontgenC.cbproj

@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -475,6 +475,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/fontgen/FontgenD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">FontgenD</ProjectName>
     </PropertyGroup>

Examples/Demos/utilities/joystick/JoystickD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">JoystickD</ProjectName>
     </PropertyGroup>
@@ -228,6 +228,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/keymap/KeymapD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">KeymapD</ProjectName>
     </PropertyGroup>
@@ -304,6 +304,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/recorder/RecorderD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">RecorderD</ProjectName>
     </PropertyGroup>
@@ -337,6 +337,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/utilities.groupproj

@@ -18,9 +18,6 @@
         <Projects Include="GLInfos\GLInfosD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="HTFUtils\HTFViewerD.dproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="joystick\JoystickD.dproj">
             <Dependencies/>
         </Projects>
@@ -36,9 +33,6 @@
         <Projects Include="ScreenSaver\ScreenSaverC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="HTFUtils\HTFPackD.dproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -92,15 +86,6 @@
     <Target Name="GLInfosD:Make">
         <MSBuild Projects="GLInfos\GLInfosD.dproj" Targets="Make"/>
     </Target>
-    <Target Name="HTFViewerD">
-        <MSBuild Projects="HTFUtils\HTFViewerD.dproj"/>
-    </Target>
-    <Target Name="HTFViewerD:Clean">
-        <MSBuild Projects="HTFUtils\HTFViewerD.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="HTFViewerD:Make">
-        <MSBuild Projects="HTFUtils\HTFViewerD.dproj" Targets="Make"/>
-    </Target>
     <Target Name="JoystickD">
         <MSBuild Projects="joystick\JoystickD.dproj"/>
     </Target>
@@ -146,23 +131,14 @@
     <Target Name="ScreenSaverC:Make">
         <MSBuild Projects="ScreenSaver\ScreenSaverC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="HTFPackD">
-        <MSBuild Projects="HTFUtils\HTFPackD.dproj"/>
-    </Target>
-    <Target Name="HTFPackD:Clean">
-        <MSBuild Projects="HTFUtils\HTFPackD.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="HTFPackD:Make">
-        <MSBuild Projects="HTFUtils\HTFPackD.dproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="ArchiverD;ArchiveEditD;FontgenD;FontgenC;GLInfosD;HTFViewerD;JoystickD;KeymapD;RecorderD;ScreenSaverD;ScreenSaverC;HTFPackD"/>
+        <CallTarget Targets="ArchiverD;ArchiveEditD;FontgenD;FontgenC;GLInfosD;JoystickD;KeymapD;RecorderD;ScreenSaverD;ScreenSaverC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="ArchiverD:Clean;ArchiveEditD:Clean;FontgenD:Clean;FontgenC:Clean;GLInfosD:Clean;HTFViewerD:Clean;JoystickD:Clean;KeymapD:Clean;RecorderD:Clean;ScreenSaverD:Clean;ScreenSaverC:Clean;HTFPackD:Clean"/>
+        <CallTarget Targets="ArchiverD:Clean;ArchiveEditD:Clean;FontgenD:Clean;FontgenC:Clean;GLInfosD:Clean;JoystickD:Clean;KeymapD:Clean;RecorderD:Clean;ScreenSaverD:Clean;ScreenSaverC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="ArchiverD:Make;ArchiveEditD:Make;FontgenD:Make;FontgenC:Make;GLInfosD:Make;HTFViewerD:Make;JoystickD:Make;KeymapD:Make;RecorderD:Make;ScreenSaverD:Make;ScreenSaverC:Make;HTFPackD:Make"/>
+        <CallTarget Targets="ArchiverD:Make;ArchiveEditD:Make;FontgenD:Make;FontgenC:Make;GLInfosD:Make;JoystickD:Make;KeymapD:Make;RecorderD:Make;ScreenSaverD:Make;ScreenSaverC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Externals/Graphics32/AppGLS/AppGLS.groupproj

@@ -0,0 +1,72 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{FDD3A4E7-EBA8-4B11-AD6C-97BB626AE0CD}</ProjectGuid>
+    </PropertyGroup>
+    <ItemGroup>
+        <Projects Include="fire2D_gr32\Fire_GR32D.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="fire2D_gr32\Fire_GR32C.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="HTFUtils\HTFPackD.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="HTFUtils\HTFViewerD.dproj">
+            <Dependencies/>
+        </Projects>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Default.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Default.Personality/>
+        </BorlandProject>
+    </ProjectExtensions>
+    <Target Name="Fire_GR32D">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj"/>
+    </Target>
+    <Target Name="Fire_GR32D:Clean">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="Fire_GR32D:Make">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32D.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="Fire_GR32C">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj"/>
+    </Target>
+    <Target Name="Fire_GR32C:Clean">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="Fire_GR32C:Make">
+        <MSBuild Projects="fire2D_gr32\Fire_GR32C.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="HTFPackD">
+        <MSBuild Projects="HTFUtils\HTFPackD.dproj"/>
+    </Target>
+    <Target Name="HTFPackD:Clean">
+        <MSBuild Projects="HTFUtils\HTFPackD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="HTFPackD:Make">
+        <MSBuild Projects="HTFUtils\HTFPackD.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="HTFViewerD">
+        <MSBuild Projects="HTFUtils\HTFViewerD.dproj"/>
+    </Target>
+    <Target Name="HTFViewerD:Clean">
+        <MSBuild Projects="HTFUtils\HTFViewerD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="HTFViewerD:Make">
+        <MSBuild Projects="HTFUtils\HTFViewerD.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="Build">
+        <CallTarget Targets="Fire_GR32D;Fire_GR32C;HTFPackD;HTFViewerD"/>
+    </Target>
+    <Target Name="Clean">
+        <CallTarget Targets="Fire_GR32D:Clean;Fire_GR32C:Clean;HTFPackD:Clean;HTFViewerD:Clean"/>
+    </Target>
+    <Target Name="Make">
+        <CallTarget Targets="Fire_GR32D:Make;Fire_GR32C:Make;HTFPackD:Make;HTFViewerD:Make"/>
+    </Target>
+    <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+</Project>

Examples/Demos/utilities/HTFUtils/HTFPackD.dproj → Externals/Graphics32/AppGLS/HTFUtils/HTFPackD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">HTFPackD</ProjectName>
     </PropertyGroup>
@@ -83,7 +83,8 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -120,10 +121,10 @@
                     <Source Name="MainSource">HTFPackD.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
@@ -246,6 +247,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/HTFUtils/HTFViewerD.dproj → Externals/Graphics32/AppGLS/HTFUtils/HTFViewerD.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">HTFViewerD</ProjectName>
     </PropertyGroup>
@@ -83,8 +83,7 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <DCC_UnitSearchPath>D:\GLScene\External\GR32\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>
     <ItemGroup>
@@ -118,14 +117,10 @@
                     <Source Name="MainSource">HTFViewerD.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIO.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIO.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIODB.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIODB.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\VirtualTreesD22.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\VirtualTreesD22.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Newton_DT.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Newton_DT.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
@@ -248,6 +243,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/utilities/HTFUtils/Readme.txt → Externals/Graphics32/AppGLS/HTFUtils/Readme.txt

@@ -1,3 +1,5 @@
+HTF Viewer with GLScene/GR32 components
+
 This directory contains several tpcfg files corresponding to "standard"
 DEM distributions, to use/pack/test them, you will have to download the
 reference DEM data (be aware some span tens of megabytes).
@@ -8,12 +10,7 @@ as original source(s) and copyrights of dataset(s) are appropriately listed
 and honoured, and a utility to unpack the dataset(s) is joined with 
 the dataset or a link/website made available.
 
-Eric Grange
-http://glscene.org
-
-
-DEM data sources
-----------------
+--------------------------------------------------------------------------------------------------
 
 TerrainBase/ETOPO5, from the NOAA National Data Center/NGDC (18 MB uncompressed)
 http://www.ngdc.noaa.gov/seg/fliers/se-1104.shtml
@@ -27,5 +24,3 @@ http://www.ngdc.noaa.gov/seg/topo/globe.shtml
 
 Maui_1k, BT file from the "Virtual Terrain Project" (4MB uncompressed)
 http://www.vterrain.org
-http://www.vterrain.org/BT/index.html
-

Examples/Demos/utilities/HTFUtils/fNavD.dfm → Externals/Graphics32/AppGLS/HTFUtils/fNavD.dfm

@@ -1,33 +1,24 @@
 object NavForm: TNavForm
   Left = 276
   Top = 328
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   BorderStyle = bsDialog
   Caption = 'Nav Form'
-  ClientHeight = 348
-  ClientWidth = 359
+  ClientHeight = 218
+  ClientWidth = 213
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   FormStyle = fsStayOnTop
   Position = poScreenCenter
-  PixelsPerInch = 168
-  TextHeight = 24
+  TextHeight = 13
   object Image: TImage32
     Left = 0
     Top = 0
-    Width = 336
-    Height = 336
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 192
+    Height = 192
     Bitmap.ResamplerClassName = 'TNearestResampler'
     BitmapAlign = baTopLeft
     Scale = 1.000000000000000000

Examples/Demos/utilities/HTFUtils/fViewerD.dfm → Externals/Graphics32/AppGLS/HTFUtils/fViewerD.dfm

@@ -1,99 +1,66 @@
 object ViewerForm: TViewerForm
   Left = 99
   Top = 98
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Caption = 'HTFViewer'
-  ClientHeight = 844
-  ClientWidth = 1115
+  ClientHeight = 482
+  ClientWidth = 637
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  PixelsPerInch = 168
-  TextHeight = 24
+  TextHeight = 13
   object ToolBar: TToolBar
     Left = 0
     Top = 0
-    Width = 1115
-    Height = 43
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 637
+    Height = 26
     AutoSize = True
     BorderWidth = 1
-    ButtonHeight = 39
-    ButtonWidth = 72
+    ButtonWidth = 41
     Caption = 'ToolBar'
     Images = ImageList
     TabOrder = 0
+    ExplicitWidth = 629
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
       Action = ACOpen
     end
     object ToolButton3: TToolButton
-      Left = 72
+      Left = 41
       Top = 0
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
       Action = ACExit
     end
     object ToolButton2: TToolButton
-      Left = 144
+      Left = 82
       Top = 0
-      Width = 14
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 8
       Caption = 'ToolButton2'
       ImageIndex = 1
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 158
+      Left = 90
       Top = 0
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
       Action = ACNavMap
     end
     object ToolButton5: TToolButton
-      Left = 230
+      Left = 131
       Top = 0
-      Width = 14
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 8
       Caption = 'ToolButton5'
       ImageIndex = 3
       Style = tbsSeparator
     end
     object TBGrid: TToolButton
-      Left = 244
+      Left = 139
       Top = 0
       Hint = 'Toggle Grid'
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
       Caption = 'TBGrid'
       Down = True
       ImageIndex = 3
@@ -101,41 +68,29 @@ object ViewerForm: TViewerForm
       OnClick = TBGridClick
     end
     object ToolButton7: TToolButton
-      Left = 316
+      Left = 180
       Top = 0
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
       Action = ACPalette
       DropdownMenu = PMPalettes
       Style = tbsDropDown
     end
     object ToolButton4: TToolButton
-      Left = 417
+      Left = 250
       Top = 0
-      Width = 14
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 8
       Caption = 'ToolButton4'
       ImageIndex = 2
       Style = tbsSeparator
     end
     object LAMap: TLabel
-      Left = 431
+      Left = 258
       Top = 0
-      Width = 88
-      Height = 39
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Width = 49
+      Height = 22
       Caption = ' No map'
       Font.Charset = ANSI_CHARSET
       Font.Color = clWindowText
-      Font.Height = -23
+      Font.Height = -13
       Font.Name = 'Arial'
       Font.Style = [fsItalic]
       ParentFont = False
@@ -144,55 +99,51 @@ object ViewerForm: TViewerForm
   end
   object PaintBox: TPaintBox32
     Left = 0
-    Top = 43
-    Width = 1115
-    Height = 766
+    Top = 26
+    Width = 637
+    Height = 436
     Cursor = crCross
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
     Align = alClient
     TabOrder = 1
     OnMouseDown = PaintBoxMouseDown
     OnMouseMove = PaintBoxMouseMove
     OnMouseUp = PaintBoxMouseUp
     OnResize = PaintBoxResize
+    ExplicitWidth = 629
+    ExplicitHeight = 411
   end
   object StatusBar: TStatusBar
     Left = 0
-    Top = 809
-    Width = 1115
-    Height = 35
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 462
+    Width = 637
+    Height = 20
     Font.Charset = ANSI_CHARSET
     Font.Color = clBtnText
-    Font.Height = -19
+    Font.Height = -11
     Font.Name = 'Arial'
     Font.Style = []
     Panels = <
       item
-        Width = 114
+        Width = 65
       end
       item
-        Width = 114
+        Width = 65
       end
       item
-        Width = 114
+        Width = 65
       end
       item
-        Width = 114
+        Width = 65
       end
       item
-        Width = 184
+        Width = 105
       end
       item
-        Width = 88
+        Width = 50
       end>
     UseSystemFont = False
+    ExplicitTop = 437
+    ExplicitWidth = 629
   end
   object ImageList: TImageList
     Left = 40

Examples/Demos/utilities/HTFUtils/fViewerD.pas → Externals/Graphics32/AppGLS/HTFUtils/fViewerD.pas

@@ -77,9 +77,7 @@ var
   ViewerForm: TViewerForm;
   heightColor: array [Low(SmallInt) .. High(SmallInt)] of TColor32;
 
-//----------------------------------------------------------------
-implementation
-//----------------------------------------------------------------
+implementation //----------------------------------------------------------
 
 {$R *.dfm}
 

Externals/Graphics32/AppGLS/_cleanapps.cmd

@@ -0,0 +1,74 @@
+echo off
+
+del *.exe /s  
+del *.scr /s
+del *.dcu /s 
+del *.ddp /s
+del *.ppu /s
+del *.o /s
+del *.~* /s
+del *.log /s
+del *.dsk /s
+del *.dof /s
+del *.bk? /s
+del *.mps /s
+del *.rst /s
+del *.s /s
+del *.a /s
+del *.map /s
+del *.rsm /s
+del *.drc /s
+del *.vrc /s
+del *.local /s
+del *.res /s
+del sk4d.dll /s
+
+rem delete more files
+
+del *.bak /s
+del *.xml /s
+del *.identcache /s
+del *.otares /s
+del *.tvsconfig /s
+del *.stat /s
+del *.db /s
+del *.~dbg /s
+del *.spider /s
+
+rem delete cpp builder files
+
+del *.hpp /s
+del *.#00 /s
+del *.pch /s
+del *.tds /s
+del *.ilc /s
+del *.ild /s
+del *.ilf /s
+del *.ils /s
+del *.pdi /s
+del *.vlb /s
+del *.obj /s
+
+echo ************************************************
+echo             Don't delete some files
+echo ************************************************
+
+attrib +R "AdvDemos/Q3Demo/Model/animation.cfg"
+rem del *.cfg /s  - there are quake's animations in assets
+attrib -R "AdvDemos/Q3Demo/Model/animation.cfg"
+
+echo---------------------------------------------------------
+echo delete debug and Platform directories with all subdirectories and files 
+for /r %1 %%R in (Bin) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Lib) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win32) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64x) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__history) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__recovery) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__astcache) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (staticobjs) do if exist "%%R" (rd /s /q "%%R")

Examples/Demos/materials/fire2D_gr32/Fire_GR32C.cbproj → Externals/Graphics32/AppGLS/fire2D_gr32/Fire_GR32C.cbproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{D6D4475A-4128-492F-8C7C-D14C4BC6D76D}</ProjectGuid>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
         <MainSource>Fire_GR32C.cpp</MainSource>
@@ -94,7 +94,6 @@
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-        <IncludePath>D:\GLScene\Examples\Demos\materials\fire2D_gr32\;$(IncludePath)</IncludePath>
         <ILINK_LibraryPath>D:\GLScene\Examples\Demos\materials\fire2D_gr32\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <SanitizedProjectName>Fire_GR32C</SanitizedProjectName>
     </PropertyGroup>
@@ -154,6 +153,8 @@
         <LinkPackageImports>rtl.bpi;vcl.bpi</LinkPackageImports>
         <BCC_UseClassicCompiler>false</BCC_UseClassicCompiler>
         <ILINK_LibraryPath>$(BDSLIB)\$(PLATFORM)$(CC_SUFFIX)\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -212,6 +213,12 @@
                 <Source>
                     <Source Name="MainSource">Fire_GR32C.cpp</Source>
                 </Source>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Deployment Version="5">
                 <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
@@ -380,6 +387,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/fire2D_gr32/Fire_GR32D.dproj → Externals/Graphics32/AppGLS/fire2D_gr32/Fire_GR32D.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">Fire_GR32D</ProjectName>
     </PropertyGroup>
@@ -79,11 +79,11 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
-        <DCC_UnitSearchPath>..\..\..\..\Source;D:\COMPONENTS\graphics32\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     </PropertyGroup>
     <ItemGroup>
@@ -114,10 +114,10 @@
                     <Source Name="MainSource">Fire_GR32D.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
@@ -240,6 +240,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>

Examples/Demos/materials/fire2D_gr32/fFire_GR32C.dfm → Externals/Graphics32/AppGLS/fire2D_gr32/fFire_GR32C.dfm

@@ -1,20 +1,15 @@
 object FormFireGR32: TFormFireGR32
   Left = 0
   Top = 0
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Caption = 'FireGR32'
-  ClientHeight = 776
-  ClientWidth = 1096
+  ClientHeight = 443
+  ClientWidth = 626
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -21
+  Font.Height = -12
   Font.Name = 'Segoe UI'
   Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 168
-  TextHeight = 30
+  TextHeight = 15
 end

Examples/Demos/materials/fire2D_gr32/fFire_GR32D.dfm → Externals/Graphics32/AppGLS/fire2D_gr32/fFire_GR32D.dfm

@@ -1,66 +1,49 @@
 object FormFire2d_GR32: TFormFire2d_GR32
   Left = 89
   Top = 65
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
-  AutoSize = True
-  BorderStyle = bsDialog
   Caption = 'Fire 2D'
-  ClientHeight = 686
-  ClientWidth = 1144
+  ClientHeight = 413
+  ClientWidth = 734
   Color = clBtnFace
-  Constraints.MinHeight = 431
-  Constraints.MinWidth = 448
+  Constraints.MinHeight = 246
+  Constraints.MinWidth = 256
   DoubleBuffered = True
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
-  PixelsPerInch = 168
-  TextHeight = 23
+  TextHeight = 13
   object Label5: TLabel
     Left = 0
     Top = 0
-    Width = 1144
-    Height = 33
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 734
+    Height = 19
     Align = alTop
     Caption = 'Dynamic Texture'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
-    Font.Height = -28
+    Font.Height = -16
     Font.Name = 'Arial'
     Font.Style = [fsBold]
     ParentFont = False
-    ExplicitLeft = 9
-    ExplicitTop = 10
-    ExplicitWidth = 228
+    ExplicitWidth = 128
   end
   object GLSceneViewer1: TGLSceneViewer
-    Left = 458
-    Top = 0
-    Width = 686
-    Height = 686
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Left = 328
+    Top = 8
+    Width = 392
+    Height = 392
     Camera = GLCamera1
     Buffer.BackgroundColor = 3881787
     Buffer.Lighting = False
-    FieldOfView = 147.492416381835900000
+    FieldOfView = 125.938278198242200000
     PenAsTouch = False
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
@@ -69,13 +52,9 @@ object FormFire2d_GR32: TFormFire2d_GR32
   end
   object PaintBox32: TPaintBox32
     Left = 0
-    Top = 238
-    Width = 448
-    Height = 448
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 136
+    Width = 322
+    Height = 264
     TabOrder = 1
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
@@ -83,13 +62,9 @@ object FormFire2d_GR32: TFormFire2d_GR32
   end
   object Memo1: TMemo
     Left = 0
-    Top = 43
-    Width = 448
-    Height = 185
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Top = 25
+    Width = 256
+    Height = 105
     Lines.Strings = (
       'The 2D fire animation below is a pure 2D '
       'animated'
@@ -113,7 +88,6 @@ object FormFire2d_GR32: TFormFire2d_GR32
       Material.Texture.MinFilter = miLinear
       Material.Texture.TextureMode = tmReplace
       Material.Texture.Compression = tcNone
-      Material.Texture.Disabled = False
       Material.MaterialLibrary = GLMaterialLibrary1
     end
     object GLCamera1: TGLCamera

Externals/Graphics32/Examples/Blending/PixelCombine/PixelCombine.dpr

@@ -6,7 +6,7 @@ uses
   Forms,
   MainUnit in 'MainUnit.pas';
 
-{$R '..\..\manifest.res'}
+{$R '..\manifest.res'}
 
 begin
   Application.Initialize;

Externals/Graphics32/Examples/GR32_Examples.groupproj

@@ -39,10 +39,10 @@
         <Projects Include="Drawing\GradFills\GradFills.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Drawing\GradLines\GradLines.dproj">
+        <Projects Include="Drawing\GradSampler\GradSampler.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Drawing\GradSampler\GradSampler.dproj">
+        <Projects Include="Drawing\GradLines\GradLines.dproj">
             <Dependencies/>
         </Projects>
         <Projects Include="Drawing\LineStippling\LineStippling.dproj">
@@ -266,15 +266,6 @@
     <Target Name="GradFills:Make">
         <MSBuild Projects="Drawing\GradFills\GradFills.dproj" Targets="Make"/>
     </Target>
-    <Target Name="GradLines">
-        <MSBuild Projects="Drawing\GradLines\GradLines.dproj"/>
-    </Target>
-    <Target Name="GradLines:Clean">
-        <MSBuild Projects="Drawing\GradLines\GradLines.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="GradLines:Make">
-        <MSBuild Projects="Drawing\GradLines\GradLines.dproj" Targets="Make"/>
-    </Target>
     <Target Name="GradSampler">
         <MSBuild Projects="Drawing\GradSampler\GradSampler.dproj"/>
     </Target>
@@ -284,6 +275,15 @@
     <Target Name="GradSampler:Make">
         <MSBuild Projects="Drawing\GradSampler\GradSampler.dproj" Targets="Make"/>
     </Target>
+    <Target Name="GradLines">
+        <MSBuild Projects="Drawing\GradLines\GradLines.dproj"/>
+    </Target>
+    <Target Name="GradLines:Clean">
+        <MSBuild Projects="Drawing\GradLines\GradLines.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GradLines:Make">
+        <MSBuild Projects="Drawing\GradLines\GradLines.dproj" Targets="Make"/>
+    </Target>
     <Target Name="LineStippling">
         <MSBuild Projects="Drawing\LineStippling\LineStippling.dproj"/>
     </Target>
@@ -600,13 +600,13 @@
         <MSBuild Projects="Drawing\Thick Lines\ThickLinesTest.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="BlendVsMerge;PixelCombine;TextureBlend;AntiAliasing;ArrowHead;Blurs;ClipperDemo;CubicSpline;Curves;GammaCorrection;GammaBlur;GradFills;GradLines;GradSampler;LineStippling;MeshGradients;Polygons;RenderText;ScatterPlot;TextVPR;ByteMaps;ColorPicker;Image32;Mandelbrot;Rotate;ImgView_Layers;RotLayer;Sprites;NestedSampling;PixelF;Resamplers;ImgWarping;Transform;Visualization;LineSimplification;Grow;Benchmark;PNG_GR32_Demo;Image32Background;PanAndZoom;PSD_export;PSD_bitmap_export;SharpenConvolution;OptimizedRepaint;ResizeAndRotate;ParticleSwarm;PerspectiveCorrection;TransparentForm;ThickLinesTest"/>
+        <CallTarget Targets="BlendVsMerge;PixelCombine;TextureBlend;AntiAliasing;ArrowHead;Blurs;ClipperDemo;CubicSpline;Curves;GammaCorrection;GammaBlur;GradFills;GradSampler;GradLines;LineStippling;MeshGradients;Polygons;RenderText;ScatterPlot;TextVPR;ByteMaps;ColorPicker;Image32;Mandelbrot;Rotate;ImgView_Layers;RotLayer;Sprites;NestedSampling;PixelF;Resamplers;ImgWarping;Transform;Visualization;LineSimplification;Grow;Benchmark;PNG_GR32_Demo;Image32Background;PanAndZoom;PSD_export;PSD_bitmap_export;SharpenConvolution;OptimizedRepaint;ResizeAndRotate;ParticleSwarm;PerspectiveCorrection;TransparentForm;ThickLinesTest"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="BlendVsMerge:Clean;PixelCombine:Clean;TextureBlend:Clean;AntiAliasing:Clean;ArrowHead:Clean;Blurs:Clean;ClipperDemo:Clean;CubicSpline:Clean;Curves:Clean;GammaCorrection:Clean;GammaBlur:Clean;GradFills:Clean;GradLines:Clean;GradSampler:Clean;LineStippling:Clean;MeshGradients:Clean;Polygons:Clean;RenderText:Clean;ScatterPlot:Clean;TextVPR:Clean;ByteMaps:Clean;ColorPicker:Clean;Image32:Clean;Mandelbrot:Clean;Rotate:Clean;ImgView_Layers:Clean;RotLayer:Clean;Sprites:Clean;NestedSampling:Clean;PixelF:Clean;Resamplers:Clean;ImgWarping:Clean;Transform:Clean;Visualization:Clean;LineSimplification:Clean;Grow:Clean;Benchmark:Clean;PNG_GR32_Demo:Clean;Image32Background:Clean;PanAndZoom:Clean;PSD_export:Clean;PSD_bitmap_export:Clean;SharpenConvolution:Clean;OptimizedRepaint:Clean;ResizeAndRotate:Clean;ParticleSwarm:Clean;PerspectiveCorrection:Clean;TransparentForm:Clean;ThickLinesTest:Clean"/>
+        <CallTarget Targets="BlendVsMerge:Clean;PixelCombine:Clean;TextureBlend:Clean;AntiAliasing:Clean;ArrowHead:Clean;Blurs:Clean;ClipperDemo:Clean;CubicSpline:Clean;Curves:Clean;GammaCorrection:Clean;GammaBlur:Clean;GradFills:Clean;GradSampler:Clean;GradLines:Clean;LineStippling:Clean;MeshGradients:Clean;Polygons:Clean;RenderText:Clean;ScatterPlot:Clean;TextVPR:Clean;ByteMaps:Clean;ColorPicker:Clean;Image32:Clean;Mandelbrot:Clean;Rotate:Clean;ImgView_Layers:Clean;RotLayer:Clean;Sprites:Clean;NestedSampling:Clean;PixelF:Clean;Resamplers:Clean;ImgWarping:Clean;Transform:Clean;Visualization:Clean;LineSimplification:Clean;Grow:Clean;Benchmark:Clean;PNG_GR32_Demo:Clean;Image32Background:Clean;PanAndZoom:Clean;PSD_export:Clean;PSD_bitmap_export:Clean;SharpenConvolution:Clean;OptimizedRepaint:Clean;ResizeAndRotate:Clean;ParticleSwarm:Clean;PerspectiveCorrection:Clean;TransparentForm:Clean;ThickLinesTest:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="BlendVsMerge:Make;PixelCombine:Make;TextureBlend:Make;AntiAliasing:Make;ArrowHead:Make;Blurs:Make;ClipperDemo:Make;CubicSpline:Make;Curves:Make;GammaCorrection:Make;GammaBlur:Make;GradFills:Make;GradLines:Make;GradSampler:Make;LineStippling:Make;MeshGradients:Make;Polygons:Make;RenderText:Make;ScatterPlot:Make;TextVPR:Make;ByteMaps:Make;ColorPicker:Make;Image32:Make;Mandelbrot:Make;Rotate:Make;ImgView_Layers:Make;RotLayer:Make;Sprites:Make;NestedSampling:Make;PixelF:Make;Resamplers:Make;ImgWarping:Make;Transform:Make;Visualization:Make;LineSimplification:Make;Grow:Make;Benchmark:Make;PNG_GR32_Demo:Make;Image32Background:Make;PanAndZoom:Make;PSD_export:Make;PSD_bitmap_export:Make;SharpenConvolution:Make;OptimizedRepaint:Make;ResizeAndRotate:Make;ParticleSwarm:Make;PerspectiveCorrection:Make;TransparentForm:Make;ThickLinesTest:Make"/>
+        <CallTarget Targets="BlendVsMerge:Make;PixelCombine:Make;TextureBlend:Make;AntiAliasing:Make;ArrowHead:Make;Blurs:Make;ClipperDemo:Make;CubicSpline:Make;Curves:Make;GammaCorrection:Make;GammaBlur:Make;GradFills:Make;GradSampler:Make;GradLines:Make;LineStippling:Make;MeshGradients:Make;Polygons:Make;RenderText:Make;ScatterPlot:Make;TextVPR:Make;ByteMaps:Make;ColorPicker:Make;Image32:Make;Mandelbrot:Make;Rotate:Make;ImgView_Layers:Make;RotLayer:Make;Sprites:Make;NestedSampling:Make;PixelF:Make;Resamplers:Make;ImgWarping:Make;Transform:Make;Visualization:Make;LineSimplification:Make;Grow:Make;Benchmark:Make;PNG_GR32_Demo:Make;Image32Background:Make;PanAndZoom:Make;PSD_export:Make;PSD_bitmap_export:Make;SharpenConvolution:Make;OptimizedRepaint:Make;ResizeAndRotate:Make;ParticleSwarm:Make;PerspectiveCorrection:Make;TransparentForm:Make;ThickLinesTest:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Externals/Graphics32/Examples/_cleanexamples.cmd

@@ -0,0 +1,74 @@
+echo off
+
+del *.exe /s  
+del *.scr /s
+del *.dcu /s 
+del *.ddp /s
+del *.ppu /s
+del *.o /s
+del *.~* /s
+del *.log /s
+del *.dsk /s
+del *.dof /s
+del *.bk? /s
+del *.mps /s
+del *.rst /s
+del *.s /s
+del *.a /s
+del *.map /s
+del *.rsm /s
+del *.drc /s
+del *.vrc /s
+del *.local /s
+del *.res /s
+del sk4d.dll /s
+
+rem delete more files
+
+del *.bak /s
+del *.xml /s
+del *.identcache /s
+del *.otares /s
+del *.tvsconfig /s
+del *.stat /s
+del *.db /s
+del *.~dbg /s
+del *.spider /s
+
+rem delete cpp builder files
+
+del *.hpp /s
+del *.#00 /s
+del *.pch /s
+del *.tds /s
+del *.ilc /s
+del *.ild /s
+del *.ilf /s
+del *.ils /s
+del *.pdi /s
+del *.vlb /s
+del *.obj /s
+
+echo ************************************************
+echo             Don't delete some files
+echo ************************************************
+
+attrib +R "AdvDemos/Q3Demo/Model/animation.cfg"
+rem del *.cfg /s  - there are quake's animations in assets
+attrib -R "AdvDemos/Q3Demo/Model/animation.cfg"
+
+echo---------------------------------------------------------
+echo delete debug and Platform directories with all subdirectories and files 
+for /r %1 %%R in (Bin) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Lib) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win32) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64x) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__history) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__recovery) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__astcache) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (staticobjs) do if exist "%%R" (rd /s /q "%%R")

Externals/Graphics32/Packages/_cleanres.cmd

@@ -0,0 +1,22 @@
+echo off
+del *.dsk /s
+del *.local /s
+del *.identcache /s
+
+del *.res /s  
+del *.obj /s
+del *.dcu /s 
+
+echo---------------------------------------------------------
+echo delete debug and Platform directories with all subdirectories and files 
+for /r %1 %%R in (Win32) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Win64x) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Debug_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (Release_Build) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__history) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__recovery) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (__astcache) do if exist "%%R" (rd /s /q "%%R")
+for /r %1 %%R in (staticobjs) do if exist "%%R" (rd /s /q "%%R")

Packages/GLScene_DT.dpk

@@ -40,23 +40,23 @@ requires
   GLScene_RT;
 
 contains
-  FRColorEditor in '..\Source\FRColorEditor.pas' {RColorEditor: TFrame},
-  FRTextureEdit in '..\Source\FRTextureEdit.pas' {RTextureEdit: TFrame},
-  FRTrackBarEdit in '..\Source\FRTrackBarEdit.pas' {RTrackBarEdit: TFrame},
-  FRFaceEditor in '..\Source\FRFaceEditor.pas' {RFaceEditor: TFrame},
-  FRMaterialPreview in '..\Source\FRMaterialPreview.pas' {RMaterialPreview: TFrame},
-  FmGuiLayoutEditor in '..\Source\FmGuiLayoutEditor.pas' {GLLayoutEditorForm},
-  FmGuiSkinEditor in '..\Source\FmGuiSkinEditor.pas' {GLSkinEditorForm},
-  FmShaderMemo in '..\Source\FmShaderMemo.pas' {ShaderMemoForm},
-  FmShaderUniformEditor in '..\Source\FmShaderUniformEditor.pas' {GLShaderUniformEditor},
-  FmVectorEditor in '..\Source\FmVectorEditor.pas' {GLVectorEditorForm},
-  FmSceneEditor in '..\Source\FmSceneEditor.pas' {GLSceneEditorForm},
-  FmXCollectionEditor in '..\Source\FmXCollectionEditor.pas' {GLXCollectionEditorForm},
-  FmInfo in '..\Source\FmInfo.pas' {GLInfoForm},
+  FRColorEditor in '..\Source\DesignTime\FRColorEditor.pas' {RColorEditor: TFrame},
+  FRTextureEdit in '..\Source\DesignTime\FRTextureEdit.pas' {RTextureEdit: TFrame},
+  FRTrackBarEdit in '..\Source\DesignTime\FRTrackBarEdit.pas' {RTrackBarEdit: TFrame},
+  FRFaceEditor in '..\Source\DesignTime\FRFaceEditor.pas' {RFaceEditor: TFrame},
+  FRMaterialPreview in '..\Source\DesignTime\FRMaterialPreview.pas' {RMaterialPreview: TFrame},
+  FmGuiLayoutEditor in '..\Source\DesignTime\FmGuiLayoutEditor.pas' {GLLayoutEditorForm},
+  FmGuiSkinEditor in '..\Source\DesignTime\FmGuiSkinEditor.pas' {GLSkinEditorForm},
+  FmShaderMemo in '..\Source\DesignTime\FmShaderMemo.pas' {ShaderMemoForm},
+  FmShaderUniformEditor in '..\Source\DesignTime\FmShaderUniformEditor.pas' {GLShaderUniformEditor},
+  FmVectorEditor in '..\Source\DesignTime\FmVectorEditor.pas' {GLVectorEditorForm},
+  FmSceneEditor in '..\Source\DesignTime\FmSceneEditor.pas' {GLSceneEditorForm},
+  FmXCollectionEditor in '..\Source\DesignTime\FmXCollectionEditor.pas' {GLXCollectionEditorForm},
+  FmInfo in '..\Source\DesignTime\FmInfo.pas' {GLInfoForm},
   GLS.SceneRegister in '..\Source\GLS.SceneRegister.pas',
   GLS.XCollectionRegister in '..\Source\GLS.XCollectionRegister.pas',
-  FmMaterialEditor in '..\Source\FmMaterialEditor.pas' {GLMaterialEditorForm},
-  FmLibMaterialPicker in '..\Source\FmLibMaterialPicker.pas' {GLLibMaterialPickerForm};
+  FmMaterialEditor in '..\Source\DesignTime\FmMaterialEditor.pas' {GLMaterialEditorForm},
+  FmLibMaterialPicker in '..\Source\DesignTime\FmLibMaterialPicker.pas' {GLLibMaterialPickerForm};
 
 end.
 

Packages/GLScene_DT.dproj

@@ -132,56 +132,56 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="VclSmp.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\FRColorEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FRColorEditor.pas">
             <Form>RColorEditor</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\Source\FRTextureEdit.pas">
+        <DCCReference Include="..\Source\DesignTime\FRTextureEdit.pas">
             <Form>RTextureEdit</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\Source\FRTrackBarEdit.pas">
+        <DCCReference Include="..\Source\DesignTime\FRTrackBarEdit.pas">
             <Form>RTrackBarEdit</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\Source\FRFaceEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FRFaceEditor.pas">
             <Form>RFaceEditor</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\Source\FRMaterialPreview.pas">
+        <DCCReference Include="..\Source\DesignTime\FRMaterialPreview.pas">
             <Form>RMaterialPreview</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\Source\FmGuiLayoutEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmGuiLayoutEditor.pas">
             <Form>GLLayoutEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmGuiSkinEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmGuiSkinEditor.pas">
             <Form>GLSkinEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmShaderMemo.pas">
+        <DCCReference Include="..\Source\DesignTime\FmShaderMemo.pas">
             <Form>ShaderMemoForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmShaderUniformEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmShaderUniformEditor.pas">
             <Form>GLShaderUniformEditor</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmVectorEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmVectorEditor.pas">
             <Form>GLVectorEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmSceneEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmSceneEditor.pas">
             <Form>GLSceneEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmXCollectionEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmXCollectionEditor.pas">
             <Form>GLXCollectionEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmInfo.pas">
+        <DCCReference Include="..\Source\DesignTime\FmInfo.pas">
             <Form>GLInfoForm</Form>
         </DCCReference>
         <DCCReference Include="..\Source\GLS.SceneRegister.pas"/>
         <DCCReference Include="..\Source\GLS.XCollectionRegister.pas"/>
-        <DCCReference Include="..\Source\FmMaterialEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmMaterialEditor.pas">
             <Form>GLMaterialEditorForm</Form>
         </DCCReference>
-        <DCCReference Include="..\Source\FmLibMaterialPicker.pas">
+        <DCCReference Include="..\Source\DesignTime\FmLibMaterialPicker.pas">
             <Form>GLLibMaterialPickerForm</Form>
         </DCCReference>
         <RcCompile Include="..\Resources\GLScene.rc">

Packages/GLScene_GPU_DT.dpk

@@ -41,6 +41,6 @@ requires
 contains
   GLS.CUDA.PropEditors in '..\Source\GLS.CUDA.PropEditors.pas',
   GLS.CUDA.Register in '..\Source\GLS.CUDA.Register.pas',
-  FmCUDAEditor in '..\Source\FmCUDAEditor.pas' {GLCUDAEditorForm};
+  FmCUDAEditor in '..\Source\DesignTime\FmCUDAEditor.pas' {GLCUDAEditorForm};
 
 end.

Packages/GLScene_GPU_DT.dproj

@@ -128,7 +128,7 @@
         <DCCReference Include="GLScene_GPU_RT.dcp"/>
         <DCCReference Include="..\Source\GLS.CUDA.PropEditors.pas"/>
         <DCCReference Include="..\Source\GLS.CUDA.Register.pas"/>
-        <DCCReference Include="..\Source\FmCUDAEditor.pas">
+        <DCCReference Include="..\Source\DesignTime\FmCUDAEditor.pas">
             <Form>GLCUDAEditorForm</Form>
             <FormType>dfm</FormType>
         </DCCReference>

Packages/GLScene_SDL_DT.dpk

@@ -1,45 +0,0 @@
-package GLScene_SDL_DT;
-
-{$R *.res}
-{$R 'GLSceneSDL.res'}
-{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO OFF}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
-{$OVERFLOWCHECKS ON}
-{$RANGECHECKS ON}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DEFINE DEBUG}
-{$ENDIF IMPLICITBUILDING}
-{$DESCRIPTION 'GLScene SDL'}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  rtl,
-  designide,
-  vcl,
-  vclimg,
-  GLScene_RT,
-  GLScene_SDL_rt;
-
-contains
-  GLS.SDL.Context in '..\Source\GLS.SDL.Context.pas';
-
-end.
-

Packages/GLScene_SDL_RT.dpk

@@ -1,42 +0,0 @@
-package GLScene_SDL_RT;
-
-{$R *.res}
-{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO OFF}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DEFINE DEBUG}
-{$ENDIF IMPLICITBUILDING}
-{$DESCRIPTION 'GLScene SDL'}
-{$RUNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  rtl,
-  vcl,
-  GLScene_RT;
-
-contains
-  GLS.SDL.Window in '..\Source\GLS.SDL.Window.pas',
-  SDL.Import in '..\Src\SDL.Import.pas';
-
-end.
-

Packages/GLScene_SDL_RT.dproj

@@ -1,1049 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <ProjectGuid>{91A76E13-D71E-44D7-A127-B0B00F1A6ADC}</ProjectGuid>
-        <MainSource>GLScene_SDL_RT.dpk</MainSource>
-        <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>1</TargetedPlatforms>
-        <AppType>Package</AppType>
-        <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.2</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <ProjectName Condition="'$(ProjectName)'==''">GLScene_SDL_RT</ProjectName>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
-        <Base_Win32>true</Base_Win32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
-        <Base_Win64>true</Base_Win64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Base)'=='true') or '$(Base_Win64x)'!=''">
-        <Base_Win64x>true</Base_Win64x>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-        <Cfg_1>true</Cfg_1>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
-        <Cfg_1_Win32>true</Cfg_1_Win32>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
-        <Cfg_1_Win64>true</Cfg_1_Win64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-        <Cfg_2>true</Cfg_2>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
-        <Cfg_2_Win32>true</Cfg_2_Win32>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
-        <Cfg_2_Win64>true</Cfg_2_Win64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base)'!=''">
-        <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
-        <DCC_E>false</DCC_E>
-        <SanitizedProjectName>GLScene_SDL_rt</SanitizedProjectName>
-        <GenDll>true</GenDll>
-        <DCC_S>false</DCC_S>
-        <DCC_ImageBase>00400000</DCC_ImageBase>
-        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-        <GenPackage>true</GenPackage>
-        <DCC_N>false</DCC_N>
-        <DCC_F>false</DCC_F>
-        <VerInfo_Locale>1049</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_K>false</DCC_K>
-        <DCC_Description>GLScene SDL Driver</DCC_Description>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
-        <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
-        <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
-        <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
-        <DCC_UnitSearchPath>..\Source;..\Src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <DCC_Description>GLScene SDL</DCC_Description>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
-        <DCC_HppOutput>..\lnclude\$(Platform)</DCC_HppOutput>
-        <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
-        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win64x)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1)'!=''">
-        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-        <DCC_DebugInformation>0</DCC_DebugInformation>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2)'!=''">
-        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        <DCC_Optimize>false</DCC_Optimize>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
-        <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-    </PropertyGroup>
-    <ItemGroup>
-        <DelphiCompile Include="$(MainSource)">
-            <MainSource>MainSource</MainSource>
-        </DelphiCompile>
-        <DCCReference Include="rtl.dcp"/>
-        <DCCReference Include="vcl.dcp"/>
-        <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\GLS.SDL.Window.pas"/>
-        <DCCReference Include="..\Src\SDL.Import.pas"/>
-        <BuildConfiguration Include="Base">
-            <Key>Base</Key>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Release">
-            <Key>Cfg_1</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Debug">
-            <Key>Cfg_2</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-    </ItemGroup>
-    <ProjectExtensions>
-        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-        <Borland.ProjectType>Package</Borland.ProjectType>
-        <BorlandProject>
-            <Delphi.Personality>
-                <Source>
-                    <Source Name="MainSource">GLScene_SDL_RT.dpk</Source>
-                </Source>
-                <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl">GXScene GBE</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-                </Excluded_Packages>
-            </Delphi.Personality>
-            <Platforms>
-                <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
-                <Platform value="Win64x">False</Platform>
-            </Platforms>
-            <Deployment Version="5">
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\GLScene_SDL_rt.bpl" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>GLScene_SDL_RT.bpl</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployClass Name="AdditionalDebugSymbols">
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidFileProvider">
-                    <Platform Name="Android">
-                        <RemoteDir>res\xml</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\xml</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidLibnativeArmeabiFile">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\armeabi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidLibnativeMipsFile">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\mips</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\mips</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidServiceOutput">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidServiceOutput_Android32">
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashImageDef">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashImageDefV21">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-anydpi-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-anydpi-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStyles">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStylesV21">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStylesV31">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_AdaptiveIcon">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-anydpi-v26</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-anydpi-v26</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_AdaptiveIconBackground">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_AdaptiveIconForeground">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_AdaptiveIconMonochrome">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_AdaptiveIconV33">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-anydpi-v33</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-anydpi-v33</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_Colors">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_ColorsDark">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values-night-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values-night-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_DefaultAppIcon">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon144">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon192">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon36">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-ldpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-ldpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon48">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon72">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon96">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon24">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon36">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon48">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon72">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon96">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage426">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-small</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-small</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage470">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-normal</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-normal</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage640">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-large</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-large</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage960">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xlarge</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-xlarge</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_Strings">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_VectorizedNotificationIcon">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-anydpi-v24</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-anydpi-v24</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_VectorizedSplash">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_VectorizedSplashDark">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-night-anydpi-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_VectorizedSplashV31">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-anydpi-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-anydpi-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_VectorizedSplashV31Dark">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>res\drawable-night-anydpi-v31</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DebugSymbols">
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DependencyFramework">
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Required="true" Name="DependencyPackage">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.bpl</Extensions>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="File">
-                    <Platform Name="Android">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectAndroidManifest">
-                    <Platform Name="Android">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOSXDebug"/>
-                <DeployClass Name="ProjectOSXEntitlements"/>
-                <DeployClass Name="ProjectOSXInfoPList"/>
-                <DeployClass Name="ProjectOSXResource">
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\Resources</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\Resources</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <RemoteDir>Contents\Resources</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Required="true" Name="ProjectOutput">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Linux64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSXARM64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOutput_Android32">
-                    <Platform Name="Android64">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectUWPManifest">
-                    <Platform Name="Win32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64x">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceDebug">
-                    <Platform Name="iOSDevice32">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSEntitlements"/>
-                <DeployClass Name="ProjectiOSInfoPList"/>
-                <DeployClass Name="ProjectiOSLaunchScreen"/>
-                <DeployClass Name="ProjectiOSResource">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="UWP_DelphiLogo150">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="UWP_DelphiLogo44">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iOS_AppStore1024">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_AppIcon152">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_AppIcon167">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_LaunchDark2x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Notification40">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Setting58">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_SpotLight80">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_AppIcon120">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_AppIcon180">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch2x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch3x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_LaunchDark2x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_LaunchDark3x">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Notification40">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Notification60">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Setting58">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Setting87">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Spotlight120">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Spotlight80">
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimARM64">
-                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSSimARM64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
-            </Deployment>
-        </BorlandProject>
-        <ProjectFileVersion>12</ProjectFileVersion>
-    </ProjectExtensions>
-    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
-    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
-    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
-</Project>