Skip to content

Commit ef4c253

Browse files
carloBarazzettacarloBarazzetta
authored
Merge pull request #2 from littleearth/main
Additional functionality
2 parents 2944a7f + 51e5486 commit ef4c253

File tree

4 files changed

+1169
-188
lines changed

4 files changed

+1169
-188
lines changed

‎Demo/GoogleMaps/GoogleMapsTest.dproj‎

Lines changed: 46 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
<DCC_DebugDCUs>true</DCC_DebugDCUs>
111111
<Version>7.0</Version>
112112
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
113+
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
113114
</PropertyGroup>
114115
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
115116
<BT_BuildType>Debug</BT_BuildType>
@@ -160,13 +161,8 @@
160161
<Source Name="MainSource">GoogleMapsTest.dpr</Source>
161162
</Source>
162163
<Excluded_Packages>
163-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
164-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclISReportBuilder6_D10_4.bpl">Ethea InstantSolutions 6 ReportBuilder Components</Excluded_Packages>
165-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclISRtl6D10_4.bpl">Ethea InstantSolutions 6 Rtl Library</Excluded_Packages>
166-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclISVcl6_D10_4.bpl">Ethea InstantSolutions 6 Vcl Library</Excluded_Packages>
167-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclISOpenOffice6_D10_4.bpl">Ethea InstantSolutions 6 LibreOffice/OpenOffice Components</Excluded_Packages>
168-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclISFLib6_D10_4.bpl">Ethea InstantSolutions 6 Framework Library</Excluded_Packages>
169-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
164+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
165+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
170166
</Excluded_Packages>
171167
</Delphi.Personality>
172168
<Platforms>
@@ -188,6 +184,16 @@
188184
<Operation>0</Operation>
189185
</Platform>
190186
</DeployClass>
187+
<DeployClass Name="AndroidClasses">
188+
<Platform Name="Android">
189+
<RemoteDir>classes</RemoteDir>
190+
<Operation>64</Operation>
191+
</Platform>
192+
<Platform Name="Android64">
193+
<RemoteDir>classes</RemoteDir>
194+
<Operation>64</Operation>
195+
</Platform>
196+
</DeployClass>
191197
<DeployClass Name="AndroidClassesDexFile">
192198
<Platform Name="Android">
193199
<RemoteDir>classes</RemoteDir>
@@ -486,6 +492,10 @@
486492
<Operation>1</Operation>
487493
<Extensions>.framework</Extensions>
488494
</Platform>
495+
<Platform Name="OSXARM64">
496+
<Operation>1</Operation>
497+
<Extensions>.framework</Extensions>
498+
</Platform>
489499
<Platform Name="Win32">
490500
<Operation>0</Operation>
491501
</Platform>
@@ -499,6 +509,10 @@
499509
<Operation>1</Operation>
500510
<Extensions>.dylib</Extensions>
501511
</Platform>
512+
<Platform Name="OSXARM64">
513+
<Operation>1</Operation>
514+
<Extensions>.dylib</Extensions>
515+
</Platform>
502516
<Platform Name="Win32">
503517
<Operation>0</Operation>
504518
<Extensions>.dll;.bpl</Extensions>
@@ -525,6 +539,10 @@
525539
<Operation>1</Operation>
526540
<Extensions>.dylib</Extensions>
527541
</Platform>
542+
<Platform Name="OSXARM64">
543+
<Operation>1</Operation>
544+
<Extensions>.dylib</Extensions>
545+
</Platform>
528546
<Platform Name="Win32">
529547
<Operation>0</Operation>
530548
<Extensions>.bpl</Extensions>
@@ -552,6 +570,9 @@
552570
<Platform Name="OSX64">
553571
<Operation>0</Operation>
554572
</Platform>
573+
<Platform Name="OSXARM64">
574+
<Operation>0</Operation>
575+
</Platform>
555576
<Platform Name="Win32">
556577
<Operation>0</Operation>
557578
</Platform>
@@ -796,6 +817,10 @@
796817
<RemoteDir>Contents\Resources</RemoteDir>
797818
<Operation>1</Operation>
798819
</Platform>
820+
<Platform Name="OSXARM64">
821+
<RemoteDir>Contents\Resources</RemoteDir>
822+
<Operation>1</Operation>
823+
</Platform>
799824
</DeployClass>
800825
<DeployClass Required="true" Name="ProjectOutput">
801826
<Platform Name="Android">
@@ -824,6 +849,9 @@
824849
<Platform Name="OSX64">
825850
<Operation>1</Operation>
826851
</Platform>
852+
<Platform Name="OSXARM64">
853+
<Operation>1</Operation>
854+
</Platform>
827855
<Platform Name="Win32">
828856
<Operation>0</Operation>
829857
</Platform>
@@ -862,16 +890,17 @@
862890
<Operation>1</Operation>
863891
</Platform>
864892
</DeployClass>
865-
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
893+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
894+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
895+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
896+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
897+
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
866898
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
899+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
867900
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
901+
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
868902
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
869-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
870-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
871-
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
872-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
873903
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
874-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
875904
</Deployment>
876905
</BorlandProject>
877906
<ProjectFileVersion>12</ProjectFileVersion>
@@ -888,17 +917,17 @@
888917
<Form>FormSecondary</Form>
889918
<FormType>dfm</FormType>
890919
</DCCReference>
891-
<BuildConfiguration Include="Debug">
892-
<Key>Cfg_2</Key>
893-
<CfgParent>Base</CfgParent>
894-
</BuildConfiguration>
895920
<BuildConfiguration Include="Base">
896921
<Key>Base</Key>
897922
</BuildConfiguration>
898923
<BuildConfiguration Include="Release">
899924
<Key>Cfg_1</Key>
900925
<CfgParent>Base</CfgParent>
901926
</BuildConfiguration>
927+
<BuildConfiguration Include="Debug">
928+
<Key>Cfg_2</Key>
929+
<CfgParent>Base</CfgParent>
930+
</BuildConfiguration>
902931
</ItemGroup>
903932
<ItemGroup/>
904933
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>

0 commit comments

Comments
 (0)